29 files changed, 31555 insertions, 24140 deletions

diff --git a/translations/subsurface_bg_BG.ts b/translations/subsurface_bg_BG.ts
index 3ea9b9110..34eb0627e 100644
--- a/translations/subsurface_bg_BG.ts
+++ b/translations/subsurface_bg_BG.ts
@@ -3,12 +3,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="539"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="522"/>
         <source>Person: </source>
         <translation>Лице:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="540"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="523"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Търсене за партньори и водачи</translation>
     </message>
@@ -16,40 +16,188 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="233"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="230"/>
         <source>No buddies</source>
         <translation>Няма партньори</translation>
     </message>
 </context>
 <context>
+    <name>ColumnNameProvider</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>GPS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Avg depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="210"/>
+        <location filename="../configuredivecomputer.cpp" line="212"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation>Не може да бъде записън бекъп файл %1. Грешка: %2</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="226"/>
+        <location filename="../configuredivecomputer.cpp" line="228"/>
         <source>Could not open backup file: %1</source>
         <translation>Не може да бъде отворен бекъп файл: %1</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="542"/>
+        <location filename="../configuredivecomputer.cpp" line="552"/>
         <source>Dive computer details read successfully</source>
         <translation>Данни на гмуркачески компютър прочетени успешно</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="551"/>
+        <location filename="../configuredivecomputer.cpp" line="561"/>
         <source>Setting successfully written to device</source>
         <translation>Настройките успешно записани на устройството</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="560"/>
+        <location filename="../configuredivecomputer.cpp" line="570"/>
         <source>Device firmware successfully updated</source>
         <translation>Фърмуер успешно обновен</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="569"/>
+        <location filename="../configuredivecomputer.cpp" line="579"/>
         <source>Device settings successfully reset</source>
         <translation>Настройките успешно рестартирани</translation>
     </message>
@@ -847,72 +995,72 @@
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1053"/>
         <source>Backup files (*.xml)</source>
         <translation>Бекъп файлове (*.xml)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1037"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>Грешка при запис на бекъп файл.
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1040"/>
         <source>Backup succeeded</source>
         <translation>Бекъп успешен</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1041"/>
         <source>Your settings have been saved to: %1</source>
         <translation>Вашите настройки бяха записани в: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1030"/>
         <source>Backup dive computer settings</source>
         <translation>Бекъп на настройки на гмуркачески компютър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1036"/>
         <source>XML backup error</source>
         <translation>XML бекъп грешка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1052"/>
         <source>Restore dive computer settings</source>
         <translation>Върни настройки на гмуркачески компютър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1056"/>
         <source>XML restore error</source>
         <translation>Грешка при XML връщане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1057"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>Настъпи грешка докато се връщаше бекъп файла.
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1063"/>
         <source>Restore succeeded</source>
         <translation>Връщане успешно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1064"/>
         <source>Your settings have been restored successfully.</source>
         <translation>Вашите настройки бяха върнати успешно.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1074"/>
         <source>Select firmware file</source>
         <translation>Изберете фърмуер файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1075"/>
         <source>All files (*.*)</source>
         <translation>Всички файлове (*.*)</translation>
     </message>
@@ -970,12 +1118,12 @@
         <translation>Кликнете тук за да изтриете бутилка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="410"/>
         <source>Cylinder cannot be removed</source>
         <translation>Бутилката не може да бъде премахната</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="407"/>
+        <location filename="../qt-ui/models.cpp" line="411"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Този газ се използвза. Само бутилки, които не се използват в гмуркането могат да бъдат премахнати.</translation>
     </message>
@@ -1051,12 +1199,12 @@
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="48"/>
         <source>Remove the selected dive computer?</source>
         <translation>Изтриване на леководолазен компютър?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="49"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
         <translation>Сигурни ли се, че искате да изтриете
@@ -1071,22 +1219,22 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Model</source>
         <translation>Модел</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Device ID</source>
         <translation>Име на устройство</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Nickname</source>
         <translation>Прякор</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Кликнете тук за да изтриете този гмуркачески компютър.</translation>
     </message>
@@ -1094,117 +1242,145 @@
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="115"/>
         <source>Bailing out to OC</source>
         <translation>Връщане към OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="117"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> начало</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> край</translation>
     </message>
 </context>
 <context>
+    <name>DiveImportedModel</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="556"/>
+        <source>Date/time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
+        <source>Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>h:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>min</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1242"/>
+        <location filename="../qt-ui/models.cpp" line="1248"/>
         <source>#</source>
         <translation>№</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1245"/>
+        <location filename="../qt-ui/models.cpp" line="1251"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1248"/>
+        <location filename="../qt-ui/models.cpp" line="1254"/>
         <source>Rating</source>
         <translation>Оценка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Depth(%1)</source>
         <translation>Дълбочина(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>m</source>
         <translation>м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>ft</source>
         <translation>фута</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1254"/>
+        <location filename="../qt-ui/models.cpp" line="1260"/>
         <source>Duration</source>
         <translation>Продълж. (мин.)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1263"/>
         <source>Temp(%1%2)</source>
         <translation>Температура(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>Weight(%1)</source>
         <translation>Тежест(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>lbs</source>
         <translation>паунда</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1263"/>
+        <location filename="../qt-ui/models.cpp" line="1269"/>
         <source>Suit</source>
         <translation>Водолазен костюм</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1266"/>
+        <location filename="../qt-ui/models.cpp" line="1272"/>
         <source>Cyl</source>
         <translation>Бут.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1269"/>
+        <location filename="../qt-ui/models.cpp" line="1275"/>
         <source>Gas</source>
         <translation>Газ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>/min</source>
         <translation>/м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1277"/>
+        <location filename="../qt-ui/models.cpp" line="1283"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1280"/>
+        <location filename="../qt-ui/models.cpp" line="1286"/>
         <source>Max CNS</source>
         <translation>Макс. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1283"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>Location</source>
         <translation>Местонахождение</translation>
     </message>
@@ -1212,87 +1388,87 @@
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="787"/>
+        <location filename="../qt-ui/divelistview.cpp" line="768"/>
         <source>Expand all</source>
         <translation>Разшири всички</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="788"/>
+        <location filename="../qt-ui/divelistview.cpp" line="769"/>
         <source>Collapse all</source>
         <translation>Свиване на всички</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="789"/>
+        <location filename="../qt-ui/divelistview.cpp" line="770"/>
         <source>Collapse others</source>
         <translation>Свиване на други</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="791"/>
+        <location filename="../qt-ui/divelistview.cpp" line="772"/>
         <source>Remove dive(s) from trip</source>
         <translation>Изтрий гмуркане (гмуркания) от пътуване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="792"/>
+        <location filename="../qt-ui/divelistview.cpp" line="773"/>
         <source>Create new trip above</source>
         <translation>Създай ново пътуване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="806"/>
+        <location filename="../qt-ui/divelistview.cpp" line="787"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Добави гмуркане (гмуркания) веднага над пътуване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="808"/>
+        <location filename="../qt-ui/divelistview.cpp" line="789"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Добави гмуркане(гмуркания) веднага под пътуване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="812"/>
+        <location filename="../qt-ui/divelistview.cpp" line="793"/>
         <source>Merge trip with trip above</source>
         <translation>Слей пътуване с горно пътуване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="813"/>
+        <location filename="../qt-ui/divelistview.cpp" line="794"/>
         <source>Merge trip with trip below</source>
         <translation>Слей пътуване с долно пътуване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="817"/>
+        <location filename="../qt-ui/divelistview.cpp" line="798"/>
         <source>Delete dive(s)</source>
         <translation>Изтрий гмуркане (гмуркания)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="819"/>
+        <location filename="../qt-ui/divelistview.cpp" line="800"/>
         <source>Mark dive(s) invalid</source>
         <translation>Маркирай гмуркания (гмуркане) като невалидни</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="823"/>
+        <location filename="../qt-ui/divelistview.cpp" line="804"/>
         <source>Merge selected dives</source>
         <translation>Слей избраните гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="825"/>
+        <location filename="../qt-ui/divelistview.cpp" line="806"/>
         <source>Renumber dive(s)</source>
         <translation>Преномерирай гмуркане (гмуркания)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="826"/>
+        <location filename="../qt-ui/divelistview.cpp" line="807"/>
         <source>Shift times</source>
         <translation>Измести времена</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="827"/>
+        <location filename="../qt-ui/divelistview.cpp" line="808"/>
         <source>Load images</source>
         <translation>Зареди изображения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Open image files</source>
         <translation>Отвори изображения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Изображения (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -1477,100 +1653,100 @@
         <translation>Пясък</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF файлове (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="268"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>CSV файлове (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="68"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Общ формат, който се използва за обмен на данни между различни видове програми.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>Данни разделени със запетая, описващи гмуркаческия профил.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation>Данни разделени със запетая описващи гмуркането. Това не включва информация за профила.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Изпрати данните от гмуркането към сайта divelogs.de.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>Изпрати данните към сайта dive-share.appspot.com</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>HTML експорт на местонахождения, визуализирани на световната карта.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurface XML формат</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
         <source>Write depths of images to file.</source>
         <translation>Запиши дълбочините във файл.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export UDDF file as</source>
         <translation>Експорт на като UDDF файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="267"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
         <source>Export CSV file as</source>
         <translation>Експорт на СSV файл като</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="278"/>
         <source>Export world map</source>
         <translation>Експорт на световна карта</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="299"/>
         <source>HTML files (*.html)</source>
         <translation>HTML файлове (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="283"/>
         <source>Export Subsurface XML</source>
         <translation>Експорт на Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="284"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML файлове (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
         <source>Save image depths</source>
         <translation>Запиши дълбочините</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="298"/>
         <source>Export HTML files as</source>
         <translation>Експортирай HTML файлове като</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
         <source>Can&apos;t open file %s</source>
         <translation>Не може да бъде отворен файл %s</translation>
     </message>
@@ -1583,248 +1759,228 @@
         <translation>Вмъкни гмуркачески регистър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
-        <source>CSV options</source>
-        <translation>CSV настройки</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="281"/>
-        <source>Pre-configured imports</source>
-        <translation>Пре-настроено вмъкване</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="122"/>
-        <source>Depth</source>
-        <translation>Дълбочина</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="142"/>
-        <source>Stopdepth</source>
-        <translation>Дълбоч. стоп</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="162"/>
-        <source>Pressure</source>
-        <translation>Налягане</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="176"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="466"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
         <source>Time</source>
         <translation>Време</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="183"/>
-        <source>Temp</source>
-        <translation>Температура</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="213"/>
-        <source>NDL</source>
-        <translation>NDL</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="233"/>
-        <source>TTS</source>
-        <translation>TTS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="253"/>
-        <source>Cns</source>
-        <translation>Cns</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="58"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="789"/>
-        <source>Field separator</source>
-        <translation>Разделител на полета</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="35"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="363"/>
-        <source>Units</source>
-        <translation>Единици</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="42"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="370"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="97"/>
         <source>Metric</source>
         <translation>Метрична</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="47"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="375"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="102"/>
         <source>Imperial</source>
         <translation>Империална</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="169"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="298"/>
-        <source>Manual dives</source>
-        <translation>Ръчнo добавени гмуркания</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="316"/>
-        <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source>
-        <translation>Изберете подредба на ден, месец и година. Разделителя може да е всеки от символите .-/.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="319"/>
-        <source>Date format</source>
-        <translation>Формат на датата</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="332"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="59"/>
         <source>dd.mm.yyyy</source>
         <translation>дд.мм.гггг</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="337"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="64"/>
         <source>mm/dd/yyyy</source>
         <translation>дд/мм/гггг</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="342"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="69"/>
         <source>yyyy-mm-dd</source>
         <translation>гггг-мм-дд</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="392"/>
-        <source>Dive #</source>
-        <translation>Гмуркане №</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="426"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="439"/>
-        <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source>
-        <translation>Дата в форлмат дд.мм.гггг, гггг-мм-дд или мм/дд/гггг.</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+        <source>Dive #</source>
+        <translation>Гмуркане №</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="429"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="500"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="513"/>
-        <source>Dive duration in seconds or in min:sec format</source>
-        <translation>Дължина на гмурката в секунди или формат мин:сек</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="503"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
         <source>Duration</source>
         <translation>Продълж. (мин.)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="574"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="591"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
         <source>Tags</source>
         <translation>Тагове</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="608"/>
-        <source>Cyl size</source>
-        <translation>Големина на бутилката</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="625"/>
-        <source>Air temp</source>
-        <translation>Темп. на въздух</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="642"/>
-        <source>Start Pressure</source>
-        <translation>Начално налягане</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="659"/>
-        <source>Water temp</source>
-        <translation>Темп. на водата</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="676"/>
-        <source>End Press</source>
-        <translation>Крайно налягане</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="693"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
         <source>O₂</source>
         <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="710"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
         <source>He</source>
         <translation>He</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="742"/>
-        <source>Choose duration format.</source>
-        <translation>Избери формат на времетраене.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="745"/>
-        <source>Duration format</source>
-        <translation>Формат на времетраене</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="758"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="78"/>
         <source>Seconds</source>
         <translation>Секунди</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="763"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
         <source>Minutes</source>
         <translation>Минути</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="768"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="88"/>
         <source>Minutes:seconds</source>
         <translation>Минути:секунди</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="540"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
         <source>Location</source>
         <translation>Местонахождение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="409"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
         <source>Max depth</source>
         <translation>Макс. дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="386"/>
-        <source>Field configuration</source>
-        <translation>Настройка на полета</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+        <source>Tab</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+        <source>Samples pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
         <source>Mean depth</source>
         <translation>Средна дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="483"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
         <source>Buddy</source>
         <translation>Партньор</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="523"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
         <source>Notes</source>
         <translation>Бележки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="557"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
         <source>Weight</source>
         <translation>Тежест</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DivePlanner</name>
@@ -1867,42 +2023,42 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="691"/>
         <source>Final depth</source>
         <translation>Финална дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="693"/>
         <source>Run time</source>
         <translation>Teчащо време</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="701"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="695"/>
         <source>Duration</source>
         <translation>Продълж. (мин.)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="703"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
         <source>Used gas</source>
         <translation>Използван газ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="705"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
         <source>CC set point</source>
         <translation>CC поставена точка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1044"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1051"/>
         <source>Discard the plan?</source>
         <translation>Изтрий плана?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1045"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1052"/>
         <source>You are about to discard your plan.</source>
         <translation>Вие ще изтриете плана.</translation>
     </message>
@@ -1910,22 +2066,22 @@
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="257"/>
         <source>Dive planner points</source>
         <translation>Точки в гмуркачески плановик</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="261"/>
         <source>Available gases</source>
         <translation>Достъпни газове</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="284"/>
         <source>Add dive data point</source>
         <translation>Добави точка в гмуркането</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="304"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="293"/>
         <source>Save new</source>
         <translation>Запиши нов</translation>
     </message>
@@ -1933,92 +2089,112 @@
 <context>
     <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Depth</source>
         <translation>Дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
         <source>Time</source>
         <translation>Време</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
         <source>Pressure</source>
         <translation>Налягане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>Temperature</source>
         <translation>Температура:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
         <source>Color</source>
         <translation>Цвят</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
         <source>Pressure S</source>
         <translation>Налягане S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
+        <source>Setpoint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
+        <source>Sensor1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
+        <source>Sensor2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
+        <source>Sensor3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
         <source>Ambient pressure</source>
         <translation>Околно налягане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
-        <source>Heart Beat</source>
-        <translation>Сърдечен ритъм</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
+        <source>Heart beat</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
-        <source>Gradient Factor</source>
-        <translation>Градиент фактор</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/>
+        <source>Gradient factor</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
-        <source>Mean Depth/s</source>
-        <translation>Средна дълбочина</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
+        <source>Mean depth/s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
         <source>Pressure I</source>
         <translation>Налягане I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
         <source>User entered</source>
         <translation>Въведено от потребителя</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
         <source>Cylinder index</source>
         <translation>Индекс на бутилка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
         <source>Ceiling</source>
         <translation>Таван</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
@@ -2069,127 +2245,127 @@
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1437"/>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1443"/>
+        <location filename="../qt-ui/models.cpp" line="1489"/>
         <source>#</source>
         <translation>№</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1440"/>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1492"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1443"/>
-        <location filename="../qt-ui/models.cpp" line="1489"/>
+        <location filename="../qt-ui/models.cpp" line="1449"/>
+        <location filename="../qt-ui/models.cpp" line="1495"/>
         <source>Rating</source>
         <translation>Оценка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1452"/>
         <source>Depth</source>
         <translation>Дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1458"/>
         <source>Temp</source>
         <translation>Температура</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1461"/>
         <source>Weight</source>
         <translation>Тежест</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>m</source>
         <translation>м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>ft</source>
         <translation>фута</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>Weight(%1)</source>
         <translation>Тежест(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1458"/>
-        <location filename="../qt-ui/models.cpp" line="1504"/>
+        <location filename="../qt-ui/models.cpp" line="1464"/>
+        <location filename="../qt-ui/models.cpp" line="1510"/>
         <source>Suit</source>
         <translation>Водолазен костюм</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1461"/>
-        <location filename="../qt-ui/models.cpp" line="1507"/>
+        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1513"/>
         <source>Cyl</source>
         <translation>Бут.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1464"/>
-        <location filename="../qt-ui/models.cpp" line="1510"/>
+        <location filename="../qt-ui/models.cpp" line="1470"/>
+        <location filename="../qt-ui/models.cpp" line="1516"/>
         <source>Gas</source>
         <translation>Газ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>/min</source>
         <translation>/м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1473"/>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1527"/>
         <source>Max CNS</source>
         <translation>Макс. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
-        <location filename="../qt-ui/models.cpp" line="1524"/>
+        <location filename="../qt-ui/models.cpp" line="1482"/>
+        <location filename="../qt-ui/models.cpp" line="1530"/>
         <source>Location</source>
         <translation>Местонахождение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>Depth(%1)</source>
         <translation>Дълбочина(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1449"/>
-        <location filename="../qt-ui/models.cpp" line="1495"/>
+        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1501"/>
         <source>Duration</source>
         <translation>Продълж. (мин.)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1498"/>
+        <location filename="../qt-ui/models.cpp" line="1504"/>
         <source>Temp(%1%2)</source>
         <translation>Температура(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>lbs</source>
         <translation>паунда</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1470"/>
-        <location filename="../qt-ui/models.cpp" line="1518"/>
+        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1524"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -2197,95 +2373,95 @@
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="98"/>
         <source>no dives were selected</source>
         <translation>няма избрани гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="117"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>не може да бъде създаден ZIP файл за качване: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="143"/>
         <source>cannot create temporary file: %s</source>
         <translation>не може да бъде създаден временен файл: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/>
         <source>internal error: %s</source>
         <translation>вътрешна грешка: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="169"/>
         <source>internal error</source>
         <translation>вътрешна грешка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="629"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="828"/>
         <source>Done</source>
         <translation>Готово</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/>
         <source>Uploading dive list...</source>
         <translation>Обновяване на списъка от гмуркания...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="692"/>
         <source>Downloading dive list...</source>
         <translation>Изтегляне на списък от гмуркания...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="741"/>
         <source>Downloading %1 dives...</source>
         <translation>Изтегляне на %1 гмуркания...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="785"/>
         <source>Download finished - %1</source>
         <translation>Изтеглянето приключи - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="802"/>
         <source>Corrupted download</source>
         <translation>Неправилно изтегляне</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Архива не може да бъде отворен:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
         <source>Upload failed</source>
         <translation>Грешка при качването</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/>
         <source>Upload successful</source>
         <translation>Успешно качване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
         <source>Login failed</source>
         <translation>Грешка при логин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
         <source>Cannot parse response</source>
         <translation>Не може да бъде направен разбор на отговора</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
         <source>Error: %1</source>
         <translation>Грешка: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="829"/>
         <source>Upload finished</source>
         <translation>Качването приключи</translation>
     </message>
@@ -2293,54 +2469,52 @@
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
-        <source>OK</source>
-        <translation>ОК</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="169"/>
         <source>Error</source>
         <translation>Грешка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="400"/>
         <source>Retry</source>
         <translation>Опитай пак</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="264"/>
         <source>Find Uemis dive computer</source>
         <translation>Намери Uemis леководолазен компютър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Изберете регистър файл при изтегляне</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Log files (*.log)</source>
         <translation>Регистър файлове (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="362"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="363"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>Записването на libdivecomputer дъмп НЕ обновява списъка на гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="374"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Изберете файл за libdivecomputer дъмп</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="375"/>
         <source>Dump files (*.bin)</source>
         <translation>Дъмп файлове (*.bin)</translation>
     </message>
@@ -2348,7 +2522,7 @@
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="101"/>
         <source>Vendor</source>
         <translation>Производител</translation>
     </message>
@@ -2358,54 +2532,74 @@
         <translation>Изтегли от леководолазен компютър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="31"/>
         <source>Device or mount point</source>
         <translation>Устройсто или входна точка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="111"/>
         <source>Dive computer</source>
         <translation>Леководолазен компютър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="132"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="45"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="80"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="94"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="52"/>
         <source>Force download of all dives</source>
         <translation>Изтегли всички гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
         <source>Always prefer downloaded dives</source>
         <translation>Винаги предпочитай изтегленото гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
         <source>OK</source>
         <translation>ОК</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="189"/>
         <source>Cancel</source>
         <translation>Отмяна</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/>
+        <source>Downloaded Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
+        <source>Select all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
+        <source>Unselect all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
         <source>Save libdivecomputer logfile</source>
         <translation>Запиши libdivecomputer регистър файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="87"/>
         <source>Save libdivecomputer dumpfile</source>
         <translation>Запиши libdivecomputer дъмп файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
         <source>Download into new trip</source>
         <translation>Изтегли в ново пътуване</translation>
     </message>
@@ -2413,12 +2607,12 @@
 <context>
     <name>ExtraDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Key</source>
         <translation>Ключ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Value</source>
         <translation>Стойност</translation>
     </message>
@@ -2432,22 +2626,20 @@
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="245"/>
-        <source>Your dive profile was updated to facebook.</source>
-        <translation>Гмуркаческия профил бе качен във Facebook</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
-        <source>Photo Upload Failed</source>
-        <translation>Грешка при качването на снимката</translation>
+        <source>Your dive profile was updated to Facebook.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="250"/>
-        <source>Your dive profile was not updated to facebook, 
+        <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
-        <translation>Вашия гмуркачески профил не бе обновен във Facebook, 
- Моля изпратете следното на авторите.
-</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+        <source>Photo Upload Failed</source>
+        <translation>Грешка при качването на снимката</translation>
     </message>
 </context>
 <context>
@@ -2489,17 +2681,17 @@
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1544"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1621"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Тази функционалност не е достъпна за избрания леководолазен комютър.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1624"/>
         <source>Firmware update failed!</source>
         <translation>Фърмуера не може да бъде обновен!</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1550"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1627"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Не може да се осъществи връзка с леководолазния компютър.</translation>
     </message>
@@ -2507,7 +2699,7 @@
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="128"/>
+        <location filename="../qt-ui/globe.cpp" line="119"/>
         <source>Edit selected dive locations</source>
         <translation>Редактирай избраните местонахождения</translation>
     </message>
@@ -2515,7 +2707,7 @@
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="566"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="549"/>
         <source>Location: </source>
         <translation>Местонахождение:</translation>
     </message>
@@ -2523,7 +2715,7 @@
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="286"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="283"/>
         <source>No location set</source>
         <translation>Няма зададено местонахождение</translation>
     </message>
@@ -2531,330 +2723,335 @@
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="133"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
+        <location filename="../qt-ui/maintab.cpp" line="497"/>
         <source>Location</source>
         <translation>Местонахождение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="67"/>
         <source>Coordinates</source>
         <translation>Координати</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="169"/>
         <source>Divemaster</source>
         <translation>Водач</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="154"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Buddy</source>
         <translation>Партньор</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="222"/>
+        <location filename="../qt-ui/maintab.ui" line="277"/>
         <source>Tags</source>
         <translation>Тагове</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="186"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
         <source>Rating</source>
         <translation>Оценка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="221"/>
         <source>Visibility</source>
         <translation>Видимост</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="230"/>
         <source>Suit</source>
         <translation>Водолазен костюм</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="465"/>
+        <location filename="../qt-ui/maintab.cpp" line="470"/>
         <source>Dive notes</source>
         <translation>Бележки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
-        <location filename="../qt-ui/maintab.ui" line="648"/>
-        <location filename="../qt-ui/maintab.cpp" line="277"/>
+        <location filename="../qt-ui/maintab.ui" line="74"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="102"/>
+        <location filename="../qt-ui/maintab.ui" line="677"/>
+        <location filename="../qt-ui/maintab.cpp" line="279"/>
         <source>Air temp.</source>
         <translation>Темп. на въздух</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <location filename="../qt-ui/maintab.ui" line="667"/>
-        <location filename="../qt-ui/maintab.cpp" line="278"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.ui" line="696"/>
+        <location filename="../qt-ui/maintab.cpp" line="280"/>
         <source>Water temp.</source>
         <translation>Темп. на водата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="229"/>
-        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.ui" line="284"/>
+        <location filename="../qt-ui/maintab.cpp" line="498"/>
         <source>Notes</source>
         <translation>Бележки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="369"/>
+        <location filename="../qt-ui/maintab.ui" line="398"/>
         <source>Equipment</source>
         <translation>Екипировка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="496"/>
+        <location filename="../qt-ui/maintab.ui" line="525"/>
         <source>Gases used</source>
         <translation>Използвани газове</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="515"/>
+        <location filename="../qt-ui/maintab.ui" line="544"/>
         <source>Gas consumed</source>
         <translation>Консумиран газ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="553"/>
+        <location filename="../qt-ui/maintab.ui" line="582"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="591"/>
+        <location filename="../qt-ui/maintab.ui" line="620"/>
         <source>Max. depth</source>
         <translation>Макс. дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="629"/>
+        <location filename="../qt-ui/maintab.ui" line="658"/>
         <source>Air pressure</source>
         <translation>Атмосф. налягане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="686"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>Dive time</source>
         <translation>Време</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="845"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
         <source>Total time</source>
         <translation>Общо време</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="903"/>
+        <location filename="../qt-ui/maintab.ui" line="932"/>
         <source>Gas consumption</source>
         <translation>Консумация на газ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="962"/>
+        <location filename="../qt-ui/maintab.ui" line="991"/>
         <source>Extra data</source>
         <translation>Допълнителни данни</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="968"/>
+        <location filename="../qt-ui/maintab.ui" line="997"/>
         <source>Additional data from dive computer</source>
         <translation>Допълнителни данни от леководолазен комютър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="54"/>
-        <location filename="../qt-ui/maintab.ui" line="458"/>
+        <location filename="../qt-ui/maintab.ui" line="83"/>
+        <location filename="../qt-ui/maintab.ui" line="487"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="61"/>
+        <location filename="../qt-ui/maintab.ui" line="90"/>
         <source>Time</source>
         <translation>Време</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="425"/>
+        <location filename="../qt-ui/maintab.ui" line="454"/>
         <source>Dive info</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="477"/>
+        <location filename="../qt-ui/maintab.ui" line="506"/>
         <source>Interval</source>
         <translation>Интервал</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="534"/>
-        <location filename="../qt-ui/maintab.ui" line="799"/>
+        <location filename="../qt-ui/maintab.ui" line="563"/>
+        <location filename="../qt-ui/maintab.ui" line="828"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="610"/>
+        <location filename="../qt-ui/maintab.ui" line="639"/>
         <source>Avg. depth</source>
         <translation>Средна дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="572"/>
+        <location filename="../qt-ui/maintab.ui" line="601"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="734"/>
         <source>Salinity</source>
         <translation>Соленост</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="742"/>
+        <location filename="../qt-ui/maintab.ui" line="771"/>
         <source>Stats</source>
         <translation>Статистики</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="775"/>
+        <location filename="../qt-ui/maintab.ui" line="804"/>
         <source>Depth</source>
         <translation>Дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="787"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Temperature</source>
         <translation>Температура:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="813"/>
+        <location filename="../qt-ui/maintab.ui" line="842"/>
         <source>Duration</source>
         <translation>Продълж. (мин.)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="864"/>
+        <location filename="../qt-ui/maintab.ui" line="893"/>
         <source>Dives</source>
         <translation>Гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="948"/>
+        <location filename="../qt-ui/maintab.ui" line="977"/>
         <source>Photos</source>
         <translation>Снимки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="95"/>
+        <location filename="../qt-ui/maintab.cpp" line="87"/>
         <source>Cylinders</source>
         <translation>Бутилки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="99"/>
+        <location filename="../qt-ui/maintab.cpp" line="91"/>
         <source>Weights</source>
         <translation>Тежести</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="55"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Apply changes</source>
         <translation>Направи промените</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="59"/>
+        <location filename="../qt-ui/maintab.cpp" line="50"/>
         <source>Discard changes</source>
         <translation>Отмени промените</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="96"/>
+        <location filename="../qt-ui/maintab.cpp" line="88"/>
         <source>Add cylinder</source>
         <translation>Добави бутилка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="100"/>
+        <location filename="../qt-ui/maintab.cpp" line="92"/>
         <source>Add weight system</source>
         <translation>Добави система за тежест</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="274"/>
+        <location filename="../qt-ui/maintab.cpp" line="276"/>
         <source>Air temp. [%1]</source>
         <translation>Tемп. на въздуха [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="275"/>
+        <location filename="../qt-ui/maintab.cpp" line="277"/>
         <source>Water temp. [%1]</source>
         <translation>Темп. на водата [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="312"/>
+        <location filename="../qt-ui/maintab.cpp" line="314"/>
         <source>This trip is being edited.</source>
         <translation>Това пътуване се редактира.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="320"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Multiple dives are being edited.</source>
         <translation>Редактира се повече от едно гмуркане.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.cpp" line="324"/>
         <source>This dive is being edited.</source>
         <translation>Това гмуркане се редактира.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="436"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
+        <location filename="../qt-ui/maintab.cpp" line="465"/>
         <source>Trip notes</source>
         <translation>Бележки за пътуване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="458"/>
+        <location filename="../qt-ui/maintab.cpp" line="463"/>
         <source>Trip location</source>
         <translation>Местонахождение на пътуване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="526"/>
-        <location filename="../qt-ui/maintab.cpp" line="558"/>
-        <location filename="../qt-ui/maintab.cpp" line="562"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
         <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="574"/>
         <source>/min</source>
         <translation>/м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="555"/>
+        <location filename="../qt-ui/maintab.cpp" line="563"/>
         <source>Deepest dive</source>
         <translation>Най-дълбоко гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="556"/>
+        <location filename="../qt-ui/maintab.cpp" line="564"/>
         <source>Shallowest dive</source>
         <translation>Най-плитко гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="569"/>
+        <location filename="../qt-ui/maintab.cpp" line="577"/>
         <source>Highest total SAC of a dive</source>
         <translation>Най-висок SAC на гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="578"/>
         <source>Lowest total SAC of a dive</source>
         <translation>Най-нисък SAC на гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="571"/>
+        <location filename="../qt-ui/maintab.cpp" line="579"/>
         <source>Average total SAC of all selected dives</source>
         <translation>Среден SAC на всички избрани гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="582"/>
+        <location filename="../qt-ui/maintab.cpp" line="590"/>
         <source>Highest temperature</source>
         <translation>Най-висока температура</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="583"/>
+        <location filename="../qt-ui/maintab.cpp" line="591"/>
         <source>Lowest temperature</source>
         <translation>Най-ниска температура</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="584"/>
+        <location filename="../qt-ui/maintab.cpp" line="592"/>
         <source>Average temperature of all selected dives</source>
         <translation>Средна температура на всички избрани гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="594"/>
+        <location filename="../qt-ui/maintab.cpp" line="602"/>
         <source>Longest dive</source>
         <translation>Най-дълго гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="595"/>
+        <location filename="../qt-ui/maintab.cpp" line="603"/>
         <source>Shortest dive</source>
         <translation>Най-късо гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="596"/>
+        <location filename="../qt-ui/maintab.cpp" line="604"/>
         <source>Average length of all selected dives</source>
         <translation>Средна дължина на избраните гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="620"/>
+        <location filename="../qt-ui/maintab.cpp" line="628"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -2863,17 +3060,17 @@ mixed from Air and using:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="624"/>
+        <location filename="../qt-ui/maintab.cpp" line="632"/>
         <source> and </source>
         <translation>и</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="911"/>
+        <location filename="../qt-ui/maintab.cpp" line="925"/>
         <source>Discard the changes?</source>
         <translation>Изтрий промените?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="912"/>
+        <location filename="../qt-ui/maintab.cpp" line="926"/>
         <source>You are about to discard your changes.</source>
         <translation>Вие ще изтриете промените.</translation>
     </message>
@@ -3020,7 +3217,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="296"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="232"/>
         <source>Open</source>
         <translation>Отвори</translation>
     </message>
@@ -3380,90 +3577,90 @@ p, li { white-space: pre-wrap; }
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="252"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="229"/>
         <source>Open file</source>
         <translation>Отвори файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="256"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="233"/>
         <source>Cancel</source>
         <translation>Отмяна</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="332"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="309"/>
         <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="444"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
         <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="491"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
         <source>Print runtime table</source>
         <translation>Напечатай рунтайм таблица</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="834"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="811"/>
         <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="836"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="813"/>
         <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="841"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="818"/>
         <source>Save changes?</source>
         <translation>Запиши промените?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1196"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1173"/>
         <source>Save file as</source>
         <translation>Запиши файла като</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1337"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1314"/>
         <source>Open dive log file</source>
         <translation>Отвори регистър файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="819"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Промените ще бъдат изгубени ако не ги запишете.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="300"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="444"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="277"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1180"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1157"/>
         <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="625"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="602"/>
         <source>Yearly statistics</source>
         <translation>Годишни статистики</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1197"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1174"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML файлове (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1338"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1315"/>
         <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source>
         <translation>Регистър файлове (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran файлове (*.can);;CSV файлове (*.csv);;DiveLog.de файлове (*.dld);;JDiveLog файлове (*.jlb);;Liquivision файлове (*.lvd);;MkVI файлове (*.txt);;Suunto файлове (*.sde *.db);;Divesoft файлове (*.dlf);;UDDF/UDCF файлове (*.uddf *.udcf);;XML файлове (*.xml);;Всички файлове (*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Моля, първо приключете с редакцията преди да започнете нова.</translation>
     </message>
@@ -3471,7 +3668,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="651"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="634"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Филтърът показва %1 (от %2) гмуркания</translation>
     </message>
@@ -3479,12 +3676,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="239"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation>Препоръчваме да обновите фърмуера на вашия гмуркачески компютър: имате версия %1, а последната стабилна версия е %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="243"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
@@ -3493,27 +3690,27 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 Моля стартирайте Bluetooth на вашия OSTC Sport и направете настройките за теглене на гмуркачески регистър преди да продължите с обновлението</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="244"/>
         <source>Not now</source>
         <translation>Не сега</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="245"/>
         <source>Update firmware</source>
         <translation>Обнови фърмуер</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
         <source>Firmware upgrade notice</source>
         <translation>Уведомление за обновяване на фърмуера</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
         <source>Save the downloaded firmware as</source>
         <translation>Запиши изтегления фърмуер като</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
         <source>HEX files (*.hex)</source>
         <translation>HEX файлове (*.hex)</translation>
     </message>
@@ -3521,54 +3718,69 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Open circuit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>ft/min</source>
         <translation>фута/мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="481"/>
         <source>Last stop at 20ft</source>
         <translation>Последен стоп на 20фута</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="482"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% средна дълбочина до 20фута</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="489"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
         <source>20ft to surface</source>
         <translation>20фута то повърхността</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="485"/>
         <source>m/min</source>
         <translation>м/мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
         <source>Last stop at 6m</source>
         <translation>Последен стоп на 6 метра</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% средна дълбочина до 6м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="494"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
         <source>6m to surface</source>
         <translation>6м до повърхността</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="497"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="498"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
         <source>cuft/min</source>
         <translation>кб.фута/мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="506"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="507"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="500"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="501"/>
         <source>ℓ/min</source>
         <translation>л/мин</translation>
     </message>
@@ -3687,6 +3899,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="816"/>
         <source>bar</source>
         <translation>бара</translation>
     </message>
@@ -3721,57 +3934,87 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="795"/>
+        <source>CCR: Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="809"/>
+        <source>Default CCR set-point for dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="832"/>
+        <source>pSCR O₂ metabolism rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="839"/>
+        <source>pSCR ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="846"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="859"/>
+        <source>1:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="875"/>
         <source>System default</source>
         <translation>По подразбиране на системата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="843"/>
+        <location filename="../qt-ui/preferences.ui" line="914"/>
         <source>Proxy</source>
         <translation>Прокси</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="849"/>
+        <location filename="../qt-ui/preferences.ui" line="920"/>
         <source>Proxy type</source>
         <translation>Прокси тип</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="862"/>
+        <location filename="../qt-ui/preferences.ui" line="933"/>
         <source>Host</source>
         <translation>Хост</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="888"/>
+        <location filename="../qt-ui/preferences.ui" line="959"/>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="914"/>
+        <location filename="../qt-ui/preferences.ui" line="985"/>
         <source>Requires authentication</source>
         <translation>Изисква автентификация</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="934"/>
+        <location filename="../qt-ui/preferences.ui" line="1005"/>
         <source>Username</source>
         <translation>Потребителско име</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="957"/>
+        <location filename="../qt-ui/preferences.ui" line="1028"/>
         <source>Password</source>
         <translation>Парола</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="985"/>
-        <source>about:blank</source>
-        <translation>about:blank</translation>
+        <location filename="../qt-ui/preferences.ui" line="1079"/>
+        <source>Disconnect from Facebook</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1011"/>
-        <source>Disconnect from facebook</source>
-        <translation>Прекъсване на връзката с Facebook</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="824"/>
+        <location filename="../qt-ui/preferences.ui" line="895"/>
         <source>Filter</source>
         <translation>Филтър</translation>
     </message>
@@ -3926,52 +4169,52 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="28"/>
+        <location filename="../qt-ui/preferences.cpp" line="44"/>
         <source>No proxy</source>
         <translation>Без прокси</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="29"/>
+        <location filename="../qt-ui/preferences.cpp" line="45"/>
         <source>System proxy</source>
         <translation>Системно прокси</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="30"/>
+        <location filename="../qt-ui/preferences.cpp" line="46"/>
         <source>HTTP proxy</source>
         <translation>HTTP прокси</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="31"/>
+        <location filename="../qt-ui/preferences.cpp" line="47"/>
         <source>SOCKS proxy</source>
         <translation>SOCKS прокси</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="291"/>
+        <location filename="../qt-ui/preferences.cpp" line="324"/>
         <source>Restart required</source>
         <translation>Нужен рестарт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="292"/>
+        <location filename="../qt-ui/preferences.cpp" line="325"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>За да смените успешно език е необходим рестарт на Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="456"/>
+        <location filename="../qt-ui/preferences.cpp" line="494"/>
         <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
         <translation>Ако изберете OK, всички настройки на Subsurface ще бъдат върнати по подразбиране. Това ще бъде изпълнено веднага.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML файлове (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Open default log file</source>
         <translation>Отвори файла по подразбиране</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="455"/>
+        <location filename="../qt-ui/preferences.cpp" line="493"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
@@ -3979,17 +4222,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="91"/>
+        <location filename="../qt-ui/printdialog.cpp" line="85"/>
         <source>&amp;Preview</source>
         <translation>&amp;Преглед</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="88"/>
+        <location filename="../qt-ui/printdialog.cpp" line="82"/>
         <source>P&amp;rint</source>
         <translation>Пе&amp;чатане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="103"/>
+        <location filename="../qt-ui/printdialog.cpp" line="97"/>
         <source>Print</source>
         <translation>Напечатай</translation>
     </message>
@@ -3997,42 +4240,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="20"/>
         <source>Dive#</source>
         <translation>Гмуркане №</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="21"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="22"/>
         <source>Depth</source>
         <translation>Дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="23"/>
         <source>Duration</source>
         <translation>Продълж. (мин.)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Master</source>
         <translation>Водач</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Buddy</source>
         <translation>Партньор</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="34"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Location</source>
         <translation>Местонахождение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <location filename="../qt-ui/printlayout.cpp" line="63"/>
         <source>Subsurface cannot find a usable printer on this system!</source>
         <translation>Subsurface не може да намери подходящ принтер на тази система!</translation>
     </message>
@@ -4098,72 +4341,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2095"/>
+        <location filename="../qt-ui/models.cpp" line="2101"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2100"/>
+        <location filename="../qt-ui/models.cpp" line="2106"/>
         <source>Dive #%1 - %2</source>
         <translation>Гмуркане №%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2103"/>
+        <location filename="../qt-ui/models.cpp" line="2109"/>
         <source>Max depth: %1 %2</source>
         <translation>Макс. дълбочина: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2110"/>
+        <location filename="../qt-ui/models.cpp" line="2116"/>
         <source>Duration: %1 min</source>
         <translation>Времетраене: %1 мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2115"/>
+        <location filename="../qt-ui/models.cpp" line="2121"/>
         <source>Gas used:</source>
         <translation>Използван газ:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2117"/>
+        <location filename="../qt-ui/models.cpp" line="2123"/>
         <source>Tags:</source>
         <translation>Тагове:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2119"/>
+        <location filename="../qt-ui/models.cpp" line="2125"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2121"/>
+        <location filename="../qt-ui/models.cpp" line="2127"/>
         <source>Weights:</source>
         <translation>Тежести:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2126"/>
+        <location filename="../qt-ui/models.cpp" line="2132"/>
         <source>Notes:</source>
         <translation>Бележки:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2133"/>
+        <location filename="../qt-ui/models.cpp" line="2139"/>
         <source>Divemaster:</source>
         <translation>Водач:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2135"/>
+        <location filename="../qt-ui/models.cpp" line="2141"/>
         <source>Buddy:</source>
         <translation>Партньор:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2137"/>
+        <location filename="../qt-ui/models.cpp" line="2143"/>
         <source>Suit:</source>
         <translation>Водолазен костюм:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2139"/>
+        <location filename="../qt-ui/models.cpp" line="2145"/>
         <source>Viz:</source>
         <translation>Видимост:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2141"/>
+        <location filename="../qt-ui/models.cpp" line="2147"/>
         <source>Rating:</source>
         <translation>Оценка:</translation>
     </message>
@@ -4171,103 +4414,108 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="628"/>
         <source> (#%1 of %2)</source>
         <translation> (№%1 от %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="630"/>
+        <source>Unknown dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="647"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>Показването на NDL / TTS бе изключено поради прекалено дълго време за обработка на данните</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1168"/>
         <source>Make first divecomputer</source>
         <translation>Направи първи гмуркачески компютър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Delete this divecomputer</source>
         <translation>Изтрий този гмуркачески компютър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1184"/>
         <source>Add gas change</source>
         <translation>Добави промяна на газа</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1187"/>
         <source> (Tank %1)</source>
         <translation>(Танк %1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1195"/>
         <source>Add set-point change</source>
         <translation>Добави set-point промяна</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1197"/>
         <source>Add bookmark</source>
         <translation>Добави бележка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
         <source>Remove event</source>
         <translation>Премахни събитие</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1206"/>
         <source>Hide similar events</source>
         <translation>Премахни малки събития</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1213"/>
         <source>Edit name</source>
         <translation>Редактирай име</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1242"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1249"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>Промени налягането на бутилка %1 (текущо интерполирана като %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1264"/>
         <source>Unhide all events</source>
         <translation>Покажи всички събития</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide events</source>
         <translation>Скрий събития</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide all %1 events?</source>
         <translation>Скрий всички %1 събития?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1333"/>
         <source>Remove the selected event?</source>
         <translation>Премахни избраните събития?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1334"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1424"/>
         <source>Edit name of bookmark</source>
         <translation>Редактирай име в показалец</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
         <source>Custom name:</source>
         <translation>Потребителско име:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1430"/>
         <source>Name is too long!</source>
         <translation> Името е прекалено дълго!</translation>
     </message>
@@ -4275,102 +4523,102 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>AIR</source>
         <translation>Въздух</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>OXYGEN</source>
         <translation>КИСЛОРОД</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="208"/>
         <source>Remove this point</source>
         <translation>Изтрий тази точка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="57"/>
         <source>Close</source>
         <translation>Затвори</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="42"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="25"/>
         <source>Average</source>
         <translation>Средно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="45"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="28"/>
         <source>Minimum</source>
         <translation>Минимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="48"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="31"/>
         <source>Maximum</source>
         <translation>Максимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="297"/>
+        <location filename="../qt-ui/globe.cpp" line="296"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>Кликнете два пъти на глобус картата за да дефинирате местонахождение на гмуркането.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="525"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="526"/>
         <source>lbs</source>
         <translation>паунда</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="550"/>
         <source>ft</source>
         <translation>фута</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="551"/>
         <source>m</source>
         <translation>м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="570"/>
+        <location filename="../qt-ui/models.cpp" line="574"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="571"/>
+        <location filename="../qt-ui/models.cpp" line="575"/>
         <source>bar</source>
         <translation>бара</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="595"/>
+        <location filename="../qt-ui/models.cpp" line="599"/>
         <source>l</source>
         <translation>л</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="596"/>
+        <location filename="../qt-ui/models.cpp" line="600"/>
         <source>cuft</source>
         <translation>кб.фута</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="513"/>
         <source>Invalid response from server</source>
         <translation>Грешен отговор от сървъра</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation>Очакван XML таг &apos;DiveDateReader&apos;, вместо това получен &apos;%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="567"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation>Очакван XML таг &apos;DiveDates&apos; не беше намерен</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Грешен XML отговор. Ред %1: %2</translation>
     </message>
@@ -4378,12 +4626,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1450"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1518"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Тази функционалност не е достъпна за избрания леководолазен комютър.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1442"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Не може да се осъществи връзка с леководолазния компютър.</translation>
     </message>
@@ -4397,12 +4645,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
-        <location filename="../qt-ui/simplewidgets.cpp" line="151"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="134"/>
         <source>New starting number</source>
         <translation>Нов стартов номер</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="149"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="132"/>
         <source>New number</source>
         <translation>Нов номер</translation>
     </message>
@@ -4410,12 +4658,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1575"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1653"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Тази функционалност не е достъпна за избрания леководолазен комютър.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1579"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1657"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Не може да се осъществи връзка с леководолазния компютър.</translation>
     </message>
@@ -4494,12 +4742,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Коя дата и час са показани на снимката?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="276"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="259"/>
         <source>Open image file</source>
         <translation>Отвори изображения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="278"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="261"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Изображения (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -4552,10 +4800,9 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <name>SocialNetworkDialog</name>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="282"/>
-        <source>Dive Date: %1 
+        <source>Dive date: %1 
 </source>
-        <translation>Дата на гмуркане: %1 
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="285"/>
@@ -4578,10 +4825,9 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="290"/>
-        <source>Dive Location: %1 
+        <source>Dive location: %1 
 </source>
-        <translation>Местонахождение: %1 
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="293"/>
@@ -4699,47 +4945,47 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="329"/>
         <source>Webservice</source>
         <translation>Уеб услуга</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="393"/>
         <source>Connecting...</source>
         <translation>Свръзване...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
         <source>Download finished</source>
         <translation>Изтеглянето приключи</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Download error: %1</source>
         <translation>Грешка при изтеглянето: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="436"/>
         <source>Connection error: </source>
         <translation>Грешка при връзка: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
         <source>Download successful</source>
         <translation>Успешно изтегляне</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="439"/>
         <source>Invalid user identifier!</source>
         <translation>Грешен потребителски ключ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="312"/>
         <source>Enter User ID and click Download</source>
         <translation>Въведете потребителски ID и натиснете &quot;Изтегли&quot;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="442"/>
         <source>Cannot parse response!</source>
         <translation>Не може да бъде напревен разряд!</translation>
     </message>
@@ -4747,7 +4993,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="592"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="575"/>
         <source>Suits: </source>
         <translation>Костюми:</translation>
     </message>
@@ -4755,7 +5001,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="119"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="116"/>
         <source>No suit set</source>
         <translation>Няма избран костюм</translation>
     </message>
@@ -4772,7 +5018,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="513"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="496"/>
         <source>Tags: </source>
         <translation>Тагове:</translation>
     </message>
@@ -4780,7 +5026,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="144"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="141"/>
         <source>Empty tags</source>
         <translation>Празни тагове</translation>
     </message>
@@ -4788,17 +5034,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>ml</source>
         <translation>мл.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>bar</source>
         <translation>бара</translation>
     </message>
@@ -4806,7 +5052,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="141"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="131"/>
         <source>Information</source>
         <translation>Информация</translation>
     </message>
@@ -4814,7 +5060,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1090"/>
+        <location filename="../qt-ui/models.cpp" line="1094"/>
         <source> (%1 shown)</source>
         <translation>(%1 показани)</translation>
     </message>
@@ -4822,72 +5068,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="64"/>
         <source>Check for updates.</source>
         <translation>Провери за обновления</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="66"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface не успя да провери за обновления.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="70"/>
         <source>The following error occurred:</source>
         <translation>Грешка:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="72"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
         <source>Please check your internet connection.</source>
         <translation>Моля проверете интернет връзката си.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="85"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="84"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>Вие използватe последната версия на Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="88"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>Има нова версия на Subsruface.&lt;br/&gt;Щракнете на:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; за да я изтеглите.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="95"/>
         <source>A new version of Subsurface is available.</source>
         <translation>Има нова версия на Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="97"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
         <source>Latest version is %1, please check with your OS vendor for updates.</source>
         <translation>Последната версия е %1. Моля проверете вашия OS доставчик за обновления.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="103"/>
         <source>Newest release version is </source>
         <translation>Най-новата весия е</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="105"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
         <source>The server returned the following information:</source>
         <translation>Сървъра върна следната информация:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="121"/>
         <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation>Subsurface проверява всеки две седмици ако нова версия е налична. Ако не искате тази проверка да продължи моля изберете Decline/Oткажи.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
         <source>Decline</source>
         <translation>Откажи</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="124"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
         <source>Accept</source>
         <translation>Приеми</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="126"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="125"/>
         <source>Automatic check for updates</source>
         <translation>Автоматична проверка за обновления</translation>
     </message>
@@ -4895,13 +5141,13 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UserManual</name>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="55"/>
+        <location filename="../qt-ui/usermanual.cpp" line="54"/>
         <source>User Manual</source>
         <translation>Ръководство за потребителя</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="72"/>
-        <location filename="../qt-ui/usermanual.cpp" line="78"/>
+        <location filename="../qt-ui/usermanual.cpp" line="71"/>
+        <location filename="../qt-ui/usermanual.cpp" line="77"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Начъчника на Subsurface не може да бъде намерен</translation>
     </message>
@@ -4979,85 +5225,85 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>От къде вмъквате данни?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
         <source>
 Operating System: %1</source>
         <translation>
 Операционна система: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 CPU архитектура: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 Language: %1</source>
         <translation>
 Език: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="93"/>
         <source>Should we ask you later?</source>
         <translation>Да ви попитаме ли по-късно?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Don&apos;t ask me again</source>
         <translation>Не ме питайте отново</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Ask later</source>
         <translation>Попитайте ме отново</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
         <source>Submit user survey.</source>
         <translation>Изпрати потребителско изследване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask again?</source>
         <translation>Да ви попитаме отново?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="17"/>
         <source>Send</source>
         <translation>Изпрати</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>
 OS CPU архитектура %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation>Subsurface не успя да изпрати потребителското изследване.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="121"/>
         <source>The following error occurred:</source>
         <translation>Грешка:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>Please check your internet connection.</source>
         <translation>Моля проверете интернет връзката си.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="131"/>
         <source>Survey successfully submitted.</source>
         <translation>Потребителското изследване изпратено успешно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="136"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation>Настъпи грешка при проверката за обновления.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -5065,12 +5311,12 @@ OS CPU архитектура %1</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
@@ -5118,12 +5364,12 @@ OS CPU архитектура %1</translation>
         <translation>Качи</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="247"/>
         <source>Operation timed out</source>
         <translation>Времето за операцията изтече</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="268"/>
         <source>Transferring data...</source>
         <translation>Трансфер на данни...</translation>
     </message>
@@ -5131,17 +5377,17 @@ OS CPU архитектура %1</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Weight</source>
         <translation>Тежест</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="496"/>
+        <location filename="../qt-ui/models.cpp" line="500"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Кликнете тук за да изтриете система за тежест.</translation>
     </message>
@@ -5149,19 +5395,19 @@ OS CPU архитектура %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1479"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1487"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1497"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1555"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1566"/>
         <source>Failed!</source>
         <translation>Неуспешна операция!</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1506"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1576"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Тази функционалност не е достъпна за избрания леководолазен комютър.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1580"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Не може да се осъществи връзка с леководолазния компютър.</translation>
     </message>
@@ -5169,79 +5415,79 @@ OS CPU архитектура %1</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1841"/>
+        <location filename="../qt-ui/models.cpp" line="1847"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Година
  &gt; Месец / Пътуване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1844"/>
+        <location filename="../qt-ui/models.cpp" line="1850"/>
         <source>#</source>
         <translation>№</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1847"/>
+        <location filename="../qt-ui/models.cpp" line="1853"/>
         <source>Duration 
  Total</source>
         <translation>Продължителност
 Общо</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1850"/>
+        <location filename="../qt-ui/models.cpp" line="1856"/>
         <source>
 Average</source>
         <translation>
 Средно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1853"/>
+        <location filename="../qt-ui/models.cpp" line="1859"/>
         <source>
 Shortest</source>
         <translation>
 Най-късо</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1856"/>
+        <location filename="../qt-ui/models.cpp" line="1862"/>
         <source>
 Longest</source>
         <translation>
 Най-дълго</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1859"/>
+        <location filename="../qt-ui/models.cpp" line="1865"/>
         <source>Depth (%1)
  Average</source>
         <translation>Дълбочина (%1)
 Средно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1862"/>
-        <location filename="../qt-ui/models.cpp" line="1871"/>
-        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>
 Minimum</source>
         <translation>
 Минимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1865"/>
-        <location filename="../qt-ui/models.cpp" line="1874"/>
-        <location filename="../qt-ui/models.cpp" line="1883"/>
+        <location filename="../qt-ui/models.cpp" line="1871"/>
+        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>
 Maximum</source>
         <translation>
 Максимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1874"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Средно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1883"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Темп. (%1)
@@ -5322,40 +5568,40 @@ Maximum</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1508"/>
+        <location filename="../dive.c" line="1530"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) или (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="464"/>
+        <location filename="../divelist.c" line="467"/>
         <location filename="../equipment.c" line="81"/>
-        <location filename="../planner.c" line="1060"/>
-        <location filename="../planner.c" line="1063"/>
+        <location filename="../planner.c" line="1081"/>
+        <location filename="../planner.c" line="1084"/>
         <source>air</source>
         <translation>въздух</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="192"/>
+        <location filename="../equipment.c" line="194"/>
         <source>integrated</source>
         <translation>вградена</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="193"/>
+        <location filename="../equipment.c" line="195"/>
         <source>belt</source>
         <translation>колан</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="194"/>
+        <location filename="../equipment.c" line="196"/>
         <source>ankle</source>
         <translation>глезен</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="195"/>
+        <location filename="../equipment.c" line="197"/>
         <source>backplate weight</source>
         <translation>нагръбна</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="196"/>
+        <location filename="../equipment.c" line="198"/>
         <source>clip-on</source>
         <translation>щипка</translation>
     </message>
@@ -5363,7 +5609,7 @@ Maximum</source>
         <location filename="../file.c" line="112"/>
         <location filename="../file.c" line="434"/>
         <location filename="../file.c" line="506"/>
-        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="925"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Не може да бъде прочетен &apos;%s&apos;</translation>
     </message>
@@ -5420,9 +5666,9 @@ Maximum</source>
         <translation>Няма подходящ Л.К. за файла &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../file.c" line="869"/>
-        <location filename="../file.c" line="909"/>
-        <location filename="../file.c" line="1007"/>
+        <location filename="../file.c" line="870"/>
+        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="1016"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>Максималният потдържан брой на CSV колони е %d</translation>
     </message>
@@ -5593,27 +5839,27 @@ Maximum</source>
         <translation>грешен номер на събитие</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="421"/>
+        <location filename="../libdivecomputer.c" line="419"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Не може да бъде създаден разряд за %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="427"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Error registering the data</source>
         <translation>Грешка при регистриране на данни</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="433"/>
         <source>Error parsing the datetime</source>
         <translation>Грешка при разряд на дата и час</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Dive %d: %s</source>
         <translation>Гмуркане №%d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="455"/>
+        <location filename="../libdivecomputer.c" line="454"/>
         <source>Error parsing the divetime</source>
         <translation>Грешка при рaзряд на време за гмуркане</translation>
     </message>
@@ -5623,166 +5869,166 @@ Maximum</source>
         <translation>Грешка при рaзряд на максимална дълбочина</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="482"/>
+        <location filename="../libdivecomputer.c" line="483"/>
         <source>Error parsing temperature</source>
         <translation>Грешка при рaзряд на температура</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="501"/>
+        <location filename="../libdivecomputer.c" line="503"/>
         <source>Error parsing the gas mix count</source>
         <translation>Грешка при рaзряд на газ микс брой</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="513"/>
+        <location filename="../libdivecomputer.c" line="515"/>
         <source>Error obtaining water salinity</source>
         <translation>Грешка при прием на водна соленост</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="521"/>
+        <location filename="../libdivecomputer.c" line="524"/>
         <source>Error obtaining surface pressure</source>
         <translation>Грешка при прием на повърхностно налягане</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="545"/>
+        <location filename="../libdivecomputer.c" line="549"/>
         <source>Error obtaining divemode</source>
         <translation>Грешка при прием на режим на гмуркане</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="562"/>
+        <location filename="../libdivecomputer.c" line="569"/>
         <source>Error parsing the gas mix</source>
         <translation>Грешка при рaзряд на газ микс</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="569"/>
+        <location filename="../libdivecomputer.c" line="576"/>
         <source>Error parsing the samples</source>
         <translation>Грешка при рaзряд на стойности</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="706"/>
+        <location filename="../libdivecomputer.c" line="713"/>
         <source>Event: waiting for user action</source>
         <translation>Събитие: изчаквание на действие от потребителя</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="714"/>
+        <location filename="../libdivecomputer.c" line="721"/>
         <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="778"/>
+        <location filename="../libdivecomputer.c" line="785"/>
         <source>Error registering the event handler.</source>
         <translation>Грешка при регистриране на направление за събития</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="783"/>
+        <location filename="../libdivecomputer.c" line="790"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Грешка при регистриране на направление за отменяне</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="804"/>
+        <location filename="../libdivecomputer.c" line="811"/>
         <source>Dive data import error</source>
         <translation>Грешка при вход на данни</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="843"/>
+        <location filename="../libdivecomputer.c" line="850"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Не може да бъде създаден libdivecomputer контекст</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="850"/>
+        <location filename="../libdivecomputer.c" line="857"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Не може да бъдe отворен %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="858"/>
+        <location filename="../libdivecomputer.c" line="865"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Недостатъчни привилегии да бъде отврено устройсто %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="506"/>
+        <location filename="../parse-xml.c" line="516"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Неразпозната стойност за проценти %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1760"/>
+        <location filename="../parse-xml.c" line="1770"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Не може да бъде напревен разбор на &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1989"/>
-        <location filename="../parse-xml.c" line="2137"/>
+        <location filename="../parse-xml.c" line="1999"/>
+        <location filename="../parse-xml.c" line="2147"/>
         <source>Database query dm4_events failed.
 </source>
         <translation>Базата данни не може да изпълни dm4_events.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1996"/>
-        <location filename="../parse-xml.c" line="2144"/>
+        <location filename="../parse-xml.c" line="2006"/>
+        <location filename="../parse-xml.c" line="2154"/>
         <source>Database query dm4_tags failed.
 </source>
         <translation>Базата данни не може да изпълни dm4_tags.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2318"/>
+        <location filename="../parse-xml.c" line="2328"/>
         <source>Database query shearwater_cylinders failed.
 </source>
         <translation>Базата данни не може да изпълни shearwater_cylinders.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2325"/>
+        <location filename="../parse-xml.c" line="2335"/>
         <source>Database query shearwater_changes failed.
 </source>
         <translation>Database query shearwater_changes failed.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2332"/>
+        <location filename="../parse-xml.c" line="2342"/>
         <source>Database query shearwater_profile_sample failed.
 </source>
         <translation>Базата данни не може да изпълни shearwater_profile_sample.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2451"/>
+        <location filename="../parse-xml.c" line="2461"/>
         <source>Database query cobalt_cylinders failed.
 </source>
         <translation>Базата данни не може да изпълни cobalt_cylinders.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2458"/>
+        <location filename="../parse-xml.c" line="2468"/>
         <source>Database query cobalt_buddies failed.
 </source>
         <translation>Базата данни не може да изпълни cobalt_buddies.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2465"/>
+        <location filename="../parse-xml.c" line="2475"/>
         <source>Database query cobalt_visibility failed.
 </source>
         <translation>Базата данни не може да изпълни cobalt_visibility.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2472"/>
+        <location filename="../parse-xml.c" line="2482"/>
         <source>Database query cobalt_location failed.
 </source>
         <translation>Базата данни не може да изпълни cobalt_location.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2479"/>
+        <location filename="../parse-xml.c" line="2489"/>
         <source>Database query cobalt_location (site) failed.
 </source>
         <translation>Базата данни не може да изпълни cobalt_location (място).
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2486"/>
+        <location filename="../parse-xml.c" line="2496"/>
         <source>Database query cobalt_profile_sample failed.
 </source>
         <translation>Базата данни не може да изпълни cobalt_profile_sample.
@@ -5796,17 +6042,17 @@ Maximum</source>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2168"/>
-        <location filename="../parse-xml.c" line="2189"/>
-        <location filename="../parse-xml.c" line="2508"/>
-        <location filename="../parse-xml.c" line="2527"/>
+        <location filename="../parse-xml.c" line="2178"/>
+        <location filename="../parse-xml.c" line="2199"/>
+        <location filename="../parse-xml.c" line="2518"/>
+        <location filename="../parse-xml.c" line="2537"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Грешка при заява към база данни &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2848"/>
+        <location filename="../parse-xml.c" line="2909"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Не може да бъде отворен стилов файл %s</translation>
     </message>
@@ -5816,161 +6062,167 @@ Maximum</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="820"/>
+        <location filename="../planner.c" line="841"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Не може да бъде намерен газ %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="356"/>
+        <location filename="../planner.c" line="363"/>
         <source>Too many gas mixes</source>
         <translation>Твърде много газови смеси</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="540"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation>Калкулирането на декомпресия е прекратено заради дълга продължителност</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="548"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation>базирано на GFlow = %d и GFHigh = %d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="544"/>
+        <location filename="../planner.c" line="551"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface гмуркачески план</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="548"/>
+        <location filename="../planner.c" line="555"/>
         <source>depth</source>
         <translation>дълбочина</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="558"/>
         <source>runtime</source>
         <translation>времетраене</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="554"/>
+        <location filename="../planner.c" line="561"/>
         <source>duration</source>
         <translation>продължителност</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="557"/>
+        <location filename="../planner.c" line="564"/>
         <source>gas</source>
         <translation>газ</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="594"/>
+        <location filename="../planner.c" line="601"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Преход към %.*f %s за %d:%02d мин - времетраене %d:%02u на %s (SP = %.1f бара)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="602"/>
+        <location filename="../planner.c" line="609"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Преход към %.*f %s за %d:%02d мин - времетраене %d:%02u на %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="615"/>
+        <location filename="../planner.c" line="622"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Остани на %.*f %s за %d:%02d мин - времетраене %d:%02u на %s (SP = %.1f бара)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="622"/>
+        <location filename="../planner.c" line="629"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Остани на %.*f %s за %d:%02d мин - времетраене %d:%02u на %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="635"/>
+        <location filename="../planner.c" line="642"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="638"/>
-        <location filename="../planner.c" line="642"/>
+        <location filename="../planner.c" line="645"/>
+        <location filename="../planner.c" line="649"/>
         <source>%3dmin</source>
         <translation>%3dмин</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="651"/>
+        <location filename="../planner.c" line="658"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1f бара)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="676"/>
+        <location filename="../planner.c" line="683"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Превключи газ към %s (SP = %.1f бара)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="678"/>
+        <location filename="../planner.c" line="685"/>
         <source>Switch gas to %s</source>
         <translation>Превключи газ на %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="697"/>
+        <location filename="../planner.c" line="704"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="699"/>
+        <location filename="../planner.c" line="706"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="710"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Консумация на газ (CCR крака включени):</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="705"/>
+        <location filename="../planner.c" line="712"/>
         <source>Gas consumption:</source>
         <translation>Консумация на газ:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="535"/>
-        <location filename="../planner.c" line="725"/>
-        <location filename="../planner.c" line="730"/>
-        <location filename="../planner.c" line="753"/>
+        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="732"/>
+        <location filename="../planner.c" line="737"/>
+        <location filename="../planner.c" line="762"/>
+        <location filename="../planner.c" line="772"/>
         <source>Warning:</source>
         <translation>Предупреждение:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="523"/>
+        <location filename="../planner.c" line="530"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
         <translation>ВНИМАНИЕ: ТОВА Е НОВО ИЗПЪЛНЕНИЕ НА АГЛОРИТЪМА НА БУЛМАН И НА ПЛАНОВИКА, КОИТО НЕ СА ТЕСТВАНИ ДОСТАТЪЧНО. МОЛЯ НЕ ПЛАНУВАЙТЕ ИЗТИНСКИ ГМУРКАНИЯ БАЗИРАНИ НА ДАННИТЕ ТУК!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="726"/>
+        <location filename="../planner.c" line="733"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>има повече газ от този на разположение в избраната бултилка</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="731"/>
+        <location filename="../planner.c" line="738"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>няма достатъчно резерв за газово споделяне при изкачване!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="733"/>
+        <location filename="../planner.c" line="740"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s от %s (%.0f%s/%.0f%s в планирано покачване)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="735"/>
+        <location filename="../planner.c" line="742"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s по време на плануваното изкачване) на %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="759"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>висока pO₂ стойност %.2f при %d:%02u с газ %s на дълбочина %.*f %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="1064"/>
+        <location filename="../planner.c" line="769"/>
+        <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="1085"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1099"/>
+        <location filename="../profile.c" line="1113"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -5979,70 +6231,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1102"/>
+        <location filename="../profile.c" line="1116"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1106"/>
+        <location filename="../profile.c" line="1120"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1112"/>
+        <location filename="../profile.c" line="1126"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1115"/>
+        <location filename="../profile.c" line="1129"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/мин
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1117"/>
+        <location filename="../profile.c" line="1131"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1119"/>
+        <location filename="../profile.c" line="1133"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fбара
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1121"/>
+        <location filename="../profile.c" line="1135"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fбара
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1123"/>
+        <location filename="../profile.c" line="1137"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fбар
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1140"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1147"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -6051,7 +6303,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1137"/>
+        <location filename="../profile.c" line="1151"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -6060,14 +6312,14 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1149"/>
+        <location filename="../profile.c" line="1163"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Стоп: %uмин @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1152"/>
+        <location filename="../profile.c" line="1166"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Стоп: неопр. време @ %.0f%s
@@ -6075,77 +6327,77 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1157"/>
+        <location filename="../profile.c" line="1171"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %uмин @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1174"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: неопр. време @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1178"/>
         <source>In deco
 </source>
         <translation>В Deco
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1166"/>
+        <location filename="../profile.c" line="1180"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %uмин
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1183"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %uмин
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1172"/>
+        <location filename="../profile.c" line="1186"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %uмин @ %.0f%s (калк.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1180"/>
+        <location filename="../profile.c" line="1194"/>
         <source>In deco (calc)
 </source>
         <translation>В Deco (калк.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1196"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %uмин (калк.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1185"/>
+        <location filename="../profile.c" line="1199"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %uмин (калк.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1188"/>
+        <location filename="../profile.c" line="1202"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Калкулиран таван %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1194"/>
+        <location filename="../profile.c" line="1208"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Тъкан %.0fмин: %.0f%s
@@ -6153,58 +6405,58 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1214"/>
         <source>heartbeat: %d
 </source>
         <translation>пулс: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1202"/>
+        <location filename="../profile.c" line="1216"/>
         <source>bearing: %d
 </source>
         <translation>лагер: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1205"/>
+        <location filename="../profile.c" line="1219"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>средна дълбочина до %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1314"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d мин</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1304"/>
-        <location filename="../profile.c" line="1308"/>
-        <location filename="../profile.c" line="1312"/>
+        <location filename="../profile.c" line="1318"/>
+        <location filename="../profile.c" line="1322"/>
+        <location filename="../profile.c" line="1326"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1316"/>
+        <location filename="../profile.c" line="1330"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1334"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1324"/>
-        <location filename="../profile.c" line="1328"/>
+        <location filename="../profile.c" line="1338"/>
+        <location filename="../profile.c" line="1342"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1335"/>
+        <location filename="../profile.c" line="1349"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -6335,6 +6587,7 @@ EADD: %d%s
     </message>
     <message>
         <location filename="../dive.c" line="30"/>
+        <location filename="../equipment.c" line="85"/>
         <source>oxygen</source>
         <translation>кислород</translation>
     </message>
@@ -6389,97 +6642,97 @@ EADD: %d%s
         <translation>(няма гмуркания)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sun</source>
         <translation>Нед</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Mon</source>
         <translation>Пон</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Tue</source>
         <translation>Вт</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Wed</source>
         <translation>Ср</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Thu</source>
         <translation>Чет</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Fri</source>
         <translation>Пет</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sat</source>
         <translation>Съб</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jan</source>
         <translation>Ян</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Feb</source>
         <translation>Фев</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Mar</source>
         <translation>Март</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Apr</source>
         <translation>Апр</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>May</source>
         <translation>Май</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jun</source>
         <translation>Юни</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Jul</source>
         <translation>Юли</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Aug</source>
         <translation>Авг</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Sep</source>
         <translation>Сеп</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Oct</source>
         <translation>Окт</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Nov</source>
         <translation>Нов</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Dec</source>
         <translation>Дек</translation>
     </message>
@@ -7083,13 +7336,13 @@ Uemis Zurich включен ли е правилно?</translation>
         <translation>Планиране</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
         <source>GF low</source>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>%</source>
         <translation>%</translation>
     </message>
@@ -7099,7 +7352,7 @@ Uemis Zurich включен ли е правилно?</translation>
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="335"/>
         <source>Drop to first depth</source>
         <translation>Спускане до първа дълбочина</translation>
     </message>
@@ -7109,69 +7362,69 @@ Uemis Zurich включен ли е правилно?</translation>
         <translation>Последен стоп на 6 метра</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
         <source>Plan backgas breaks</source>
         <translation>Планирай &quot;бекгас брейкс&quot;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="355"/>
         <source>Gas options</source>
         <translation>Газ настройки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="376"/>
         <source>Bottom SAC</source>
         <translation>Долен SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="383"/>
         <source>Deco SAC</source>
         <translation>Деко SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="380"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="390"/>
         <source>Bottom pO₂</source>
         <translation>Долен pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="403"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="413"/>
         <source>Deco pO₂</source>
         <translation>Деко pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="449"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="462"/>
         <source>ℓ/min</source>
         <translation>л/мин.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="478"/>
         <source>Dive notes</source>
         <translation>Бележки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
         <source>Display runtime</source>
         <translation>Покажи времетраене</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <source>Display segment duration</source>
         <translation>Покажи времетраене на сегментацията</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="531"/>
         <source>Display transitions in deco</source>
         <translation>Покажи транзиции в декомпресията</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="538"/>
         <source>Verbatim dive plan</source>
         <translation>Дословен гмуркачески план</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="387"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="410"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="397"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="420"/>
         <source>bar</source>
         <translation>бара</translation>
     </message>
@@ -7191,17 +7444,17 @@ Uemis Zurich включен ли е правилно?</translation>
         <translation>6м до повърхността</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="499"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>Покажи времетраене (абсолютно време) на стоповете в гмуркаческия план</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="515"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>Покажи времетраене (oтносително време) на стоповете в гмуркаческия план</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>Покажи преводи или ги третирай като косвени в гмуркаческия план</translation>
     </message>
diff --git a/translations/subsurface_da_DK.ts b/translations/subsurface_da_DK.ts
index 6e9f6f454..2cade31fa 100644
--- a/translations/subsurface_da_DK.ts
+++ b/translations/subsurface_da_DK.ts
@@ -3,12 +3,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="539"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="522"/>
         <source>Person: </source>
         <translation>Person:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="540"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="523"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Søger efter makkere og divemasters</translation>
     </message>
@@ -16,40 +16,188 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="233"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="230"/>
         <source>No buddies</source>
         <translation>Ingen makkere</translation>
     </message>
 </context>
 <context>
+    <name>ColumnNameProvider</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>GPS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Avg depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="210"/>
+        <location filename="../configuredivecomputer.cpp" line="212"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation>Kunne ikke gemme backup fil %1. Fejl besked: %2</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="226"/>
+        <location filename="../configuredivecomputer.cpp" line="228"/>
         <source>Could not open backup file: %1</source>
         <translation>Kunne ikke åbne backup fil: %1</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="542"/>
+        <location filename="../configuredivecomputer.cpp" line="552"/>
         <source>Dive computer details read successfully</source>
         <translation>Detaljer fra dykkercomputeren er læst med succes</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="551"/>
+        <location filename="../configuredivecomputer.cpp" line="561"/>
         <source>Setting successfully written to device</source>
         <translation>Indstillinger er succesfuldt skevet til enheden</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="560"/>
+        <location filename="../configuredivecomputer.cpp" line="570"/>
         <source>Device firmware successfully updated</source>
         <translation>Firmware er opdateret med succes</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="569"/>
+        <location filename="../configuredivecomputer.cpp" line="579"/>
         <source>Device settings successfully reset</source>
         <translation>Indstillinger for enheden er nulstillet</translation>
     </message>
@@ -847,72 +995,72 @@
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1053"/>
         <source>Backup files (*.xml)</source>
         <translation>Backup filer (*.xml)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1037"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>Det opstod en fejl under skrivning af backup fil:
 %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1040"/>
         <source>Backup succeeded</source>
         <translation>Backup færdig med succes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1041"/>
         <source>Your settings have been saved to: %1</source>
         <translation>Dine indstillinger er gemt til: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1030"/>
         <source>Backup dive computer settings</source>
         <translation>Backup af dykker computer indstillinger</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1036"/>
         <source>XML backup error</source>
         <translation>XML backup fejl</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1052"/>
         <source>Restore dive computer settings</source>
         <translation>Gendan dykker computer indstillinger</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1056"/>
         <source>XML restore error</source>
         <translation>XML gendannelses fejl</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1057"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>En fejl opstod under indlæsning af backup file
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1063"/>
         <source>Restore succeeded</source>
         <translation>Gendannet med succes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1064"/>
         <source>Your settings have been restored successfully.</source>
         <translation>Dine indstillinger er blevet gendannet med succes.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1074"/>
         <source>Select firmware file</source>
         <translation>Vælg firmware fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1075"/>
         <source>All files (*.*)</source>
         <translation>Alle filer(*.*)</translation>
     </message>
@@ -970,12 +1118,12 @@
         <translation>Klik her vil fjerne flasken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="410"/>
         <source>Cylinder cannot be removed</source>
         <translation>Flasken kan ikke fjernes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="407"/>
+        <location filename="../qt-ui/models.cpp" line="411"/>
         <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>
@@ -1051,12 +1199,12 @@
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="48"/>
         <source>Remove the selected dive computer?</source>
         <translation>Fjern den valgte computer?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="49"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
         <translation>Er du sikker på at du vil
@@ -1071,22 +1219,22 @@ fjerne den valgte dykkercomputer?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Model</source>
         <translation>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Device ID</source>
         <translation>Enheds ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Nickname</source>
         <translation>Kaldenavn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Klik her vil fjerne denne dykkercomputer.</translation>
     </message>
@@ -1094,117 +1242,145 @@ fjerne den valgte dykkercomputer?</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="115"/>
         <source>Bailing out to OC</source>
         <translation>BailOut til OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="117"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>start</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>slut</translation>
     </message>
 </context>
 <context>
+    <name>DiveImportedModel</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="556"/>
+        <source>Date/time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
+        <source>Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>h:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>min</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1242"/>
+        <location filename="../qt-ui/models.cpp" line="1248"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1245"/>
+        <location filename="../qt-ui/models.cpp" line="1251"/>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1248"/>
+        <location filename="../qt-ui/models.cpp" line="1254"/>
         <source>Rating</source>
         <translation>Bedømmelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Depth(%1)</source>
         <translation>Dybde(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1254"/>
+        <location filename="../qt-ui/models.cpp" line="1260"/>
         <source>Duration</source>
         <translation>Varighed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1263"/>
         <source>Temp(%1%2)</source>
         <translation>Temp(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>Weight(%1)</source>
         <translation>Vægt(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1263"/>
+        <location filename="../qt-ui/models.cpp" line="1269"/>
         <source>Suit</source>
         <translation>Dragt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1266"/>
+        <location filename="../qt-ui/models.cpp" line="1272"/>
         <source>Cyl</source>
         <translation>Cyl</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1269"/>
+        <location filename="../qt-ui/models.cpp" line="1275"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1277"/>
+        <location filename="../qt-ui/models.cpp" line="1283"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1280"/>
+        <location filename="../qt-ui/models.cpp" line="1286"/>
         <source>Max CNS</source>
         <translation>Maks CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1283"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>Location</source>
         <translation>Placering</translation>
     </message>
@@ -1212,87 +1388,87 @@ fjerne den valgte dykkercomputer?</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="787"/>
+        <location filename="../qt-ui/divelistview.cpp" line="768"/>
         <source>Expand all</source>
         <translation>Udvid alt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="788"/>
+        <location filename="../qt-ui/divelistview.cpp" line="769"/>
         <source>Collapse all</source>
         <translation>Skjul alle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="789"/>
+        <location filename="../qt-ui/divelistview.cpp" line="770"/>
         <source>Collapse others</source>
         <translation>Saml andre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="791"/>
+        <location filename="../qt-ui/divelistview.cpp" line="772"/>
         <source>Remove dive(s) from trip</source>
         <translation>Fjern dyk fra tur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="792"/>
+        <location filename="../qt-ui/divelistview.cpp" line="773"/>
         <source>Create new trip above</source>
         <translation>Opret ny tur over</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="806"/>
+        <location filename="../qt-ui/divelistview.cpp" line="787"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Tilføj dyk umiddelbart over</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="808"/>
+        <location filename="../qt-ui/divelistview.cpp" line="789"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Tilføj dyk umiddelbart under</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="812"/>
+        <location filename="../qt-ui/divelistview.cpp" line="793"/>
         <source>Merge trip with trip above</source>
         <translation>Flet tur med turen over</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="813"/>
+        <location filename="../qt-ui/divelistview.cpp" line="794"/>
         <source>Merge trip with trip below</source>
         <translation>Flet tur med turen under</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="817"/>
+        <location filename="../qt-ui/divelistview.cpp" line="798"/>
         <source>Delete dive(s)</source>
         <translation>Slet dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="819"/>
+        <location filename="../qt-ui/divelistview.cpp" line="800"/>
         <source>Mark dive(s) invalid</source>
         <translation>Marker dyk som ugyldige</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="823"/>
+        <location filename="../qt-ui/divelistview.cpp" line="804"/>
         <source>Merge selected dives</source>
         <translation>Flet valgte dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="825"/>
+        <location filename="../qt-ui/divelistview.cpp" line="806"/>
         <source>Renumber dive(s)</source>
         <translation>Gen-Numerer dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="826"/>
+        <location filename="../qt-ui/divelistview.cpp" line="807"/>
         <source>Shift times</source>
         <translation>Skift tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="827"/>
+        <location filename="../qt-ui/divelistview.cpp" line="808"/>
         <source>Load images</source>
         <translation>Indlæs billeder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Open image files</source>
         <translation>Åben billed filer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Billed filer (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -1477,100 +1653,100 @@ fjerne den valgte dykkercomputer?</translation>
         <translation>Sand</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF filer (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="268"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>CSV filer (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="68"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Basis format bruges til udveksling af data mellem diverse dykker relaterede programmer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Send data til divelog.de hjemmeside</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>Send dykker data til dive-share.appspot.com webside</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>HTML eksport af dykker lokationer, vist på kortet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurface originale XML format</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
         <source>Write depths of images to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export UDDF file as</source>
         <translation>Eksporter UDDF fil som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="267"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
         <source>Export CSV file as</source>
         <translation>Eksporter CSV fil som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="278"/>
         <source>Export world map</source>
         <translation>Eksporter verdens kort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="299"/>
         <source>HTML files (*.html)</source>
         <translation>HTML filer (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="283"/>
         <source>Export Subsurface XML</source>
         <translation>Eksporter Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="284"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML filer (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
         <source>Save image depths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="298"/>
         <source>Export HTML files as</source>
         <translation>Exporter HTML filer som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
         <source>Can&apos;t open file %s</source>
         <translation>Kan ikke åbne filen %s</translation>
     </message>
@@ -1583,248 +1759,228 @@ fjerne den valgte dykkercomputer?</translation>
         <translation>Importer dykkerlog</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
-        <source>CSV options</source>
-        <translation>CSV muligheder</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="281"/>
-        <source>Pre-configured imports</source>
-        <translation>Pre-konfigurerede imports</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="122"/>
-        <source>Depth</source>
-        <translation>Dybde</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="142"/>
-        <source>Stopdepth</source>
-        <translation>Stop dybde</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="162"/>
-        <source>Pressure</source>
-        <translation>Tryk</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="176"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="466"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
         <source>Time</source>
         <translation>Tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="183"/>
-        <source>Temp</source>
-        <translation>Temp</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="213"/>
-        <source>NDL</source>
-        <translation>NDL</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="233"/>
-        <source>TTS</source>
-        <translation>TTS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="253"/>
-        <source>Cns</source>
-        <translation>Cns</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="58"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="789"/>
-        <source>Field separator</source>
-        <translation>Felt seperator</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="35"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="363"/>
-        <source>Units</source>
-        <translation>Enheder</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="42"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="370"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="97"/>
         <source>Metric</source>
         <translation>Metrisk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="47"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="375"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="102"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="169"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="298"/>
-        <source>Manual dives</source>
-        <translation>Manuelle dyk</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="316"/>
-        <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source>
-        <translation>Vælg format for dag, måned og år. Adskillelses tegn kan være .-/. </translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="319"/>
-        <source>Date format</source>
-        <translation>Data format</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="332"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="59"/>
         <source>dd.mm.yyyy</source>
         <translation>dd.mm.åååå</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="337"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="64"/>
         <source>mm/dd/yyyy</source>
         <translation>mm/dd/åååå</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="342"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="69"/>
         <source>yyyy-mm-dd</source>
         <translation>åååå-mm-dd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="392"/>
-        <source>Dive #</source>
-        <translation>Dyk #</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="426"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="439"/>
-        <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source>
-        <translation>Dato i dd.mm.yyyy, yyyy-mm-dd eller mm/dd/yyyy format</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+        <source>Dive #</source>
+        <translation>Dyk #</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="429"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="500"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="513"/>
-        <source>Dive duration in seconds or in min:sec format</source>
-        <translation>Dykkets varighed i sekunder eller i min:sek format</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="503"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
         <source>Duration</source>
         <translation>Varighed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="574"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="591"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
         <source>Tags</source>
         <translation>Tags</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="608"/>
-        <source>Cyl size</source>
-        <translation>Flaske størrelse</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+        <source>O₂</source>
+        <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="625"/>
-        <source>Air temp</source>
-        <translation>Luft temp</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+        <source>He</source>
+        <translation>He</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="642"/>
-        <source>Start Pressure</source>
-        <translation>Start Tryk</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="78"/>
+        <source>Seconds</source>
+        <translation>Sekunder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="659"/>
-        <source>Water temp</source>
-        <translation>Vand temp</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
+        <source>Minutes</source>
+        <translation>Minutter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="676"/>
-        <source>End Press</source>
-        <translation>Slut Tryk</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="88"/>
+        <source>Minutes:seconds</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="693"/>
-        <source>O₂</source>
-        <translation>O₂</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+        <source>Location</source>
+        <translation>Lokation</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="710"/>
-        <source>He</source>
-        <translation>He</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+        <source>Max depth</source>
+        <translation>Max dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="742"/>
-        <source>Choose duration format.</source>
-        <translation>Vælg varighed format.</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+        <source>Tab</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="745"/>
-        <source>Duration format</source>
-        <translation>Varighed format</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="758"/>
-        <source>Seconds</source>
-        <translation>Sekunder</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="763"/>
-        <source>Minutes</source>
-        <translation>Minutter</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="768"/>
-        <source>Minutes:seconds</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+        <source>Sample temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="540"/>
-        <source>Location</source>
-        <translation>Lokation</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="409"/>
-        <source>Max depth</source>
-        <translation>Max dybde</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="386"/>
-        <source>Field configuration</source>
-        <translation>Felt konfiguration</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+        <source>Samples pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
         <source>Mean depth</source>
         <translation>Gnm dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="483"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
         <source>Buddy</source>
         <translation>Makker</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="523"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
         <source>Notes</source>
         <translation>Noter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="557"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
         <source>Weight</source>
         <translation>Vægt</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DivePlanner</name>
@@ -1867,42 +2023,42 @@ fjerne den valgte dykkercomputer?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
         <source>unknown</source>
         <translation>Ukendt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="691"/>
         <source>Final depth</source>
         <translation>Slut dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="693"/>
         <source>Run time</source>
         <translation>Run time</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="701"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="695"/>
         <source>Duration</source>
         <translation>Varighed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="703"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
         <source>Used gas</source>
         <translation>Brugt gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="705"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
         <source>CC set point</source>
         <translation>CC set point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1044"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1051"/>
         <source>Discard the plan?</source>
         <translation>Drop planen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1045"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1052"/>
         <source>You are about to discard your plan.</source>
         <translation>Du er ved at droppe din plan.</translation>
     </message>
@@ -1910,22 +2066,22 @@ fjerne den valgte dykkercomputer?</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="257"/>
         <source>Dive planner points</source>
         <translation>Planlægnings punkter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="261"/>
         <source>Available gases</source>
         <translation>Gas til rådighed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="284"/>
         <source>Add dive data point</source>
         <translation>Tilføj punkt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="304"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="293"/>
         <source>Save new</source>
         <translation>Gem ny</translation>
     </message>
@@ -1933,92 +2089,112 @@ fjerne den valgte dykkercomputer?</translation>
 <context>
     <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
         <source>Time</source>
         <translation>Tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
         <source>Pressure</source>
         <translation>Tryk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
         <source>Color</source>
         <translation>Farve</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
         <source>Pressure S</source>
         <translation>Tryk S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
+        <source>Setpoint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
+        <source>Sensor1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
+        <source>Sensor2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
+        <source>Sensor3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
         <source>Ambient pressure</source>
         <translation>Omgivende tryk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
-        <source>Heart Beat</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
+        <source>Heart beat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
-        <source>Gradient Factor</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/>
+        <source>Gradient factor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
-        <source>Mean Depth/s</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
+        <source>Mean depth/s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
         <source>Pressure I</source>
         <translation>Tryk I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
         <source>User entered</source>
         <translation>Bruger tilføjet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
         <source>Cylinder index</source>
         <translation>Flaske oversigt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
         <source>Ceiling</source>
         <translation>Loft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
@@ -2069,127 +2245,127 @@ fjerne den valgte dykkercomputer?</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1437"/>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1443"/>
+        <location filename="../qt-ui/models.cpp" line="1489"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1440"/>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1492"/>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1443"/>
-        <location filename="../qt-ui/models.cpp" line="1489"/>
+        <location filename="../qt-ui/models.cpp" line="1449"/>
+        <location filename="../qt-ui/models.cpp" line="1495"/>
         <source>Rating</source>
         <translation>Bedømmelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1452"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1458"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1461"/>
         <source>Weight</source>
         <translation>Vægt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>ft</source>
         <translation>fod</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>Weight(%1)</source>
         <translation>Vægt(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1458"/>
-        <location filename="../qt-ui/models.cpp" line="1504"/>
+        <location filename="../qt-ui/models.cpp" line="1464"/>
+        <location filename="../qt-ui/models.cpp" line="1510"/>
         <source>Suit</source>
         <translation>Dragt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1461"/>
-        <location filename="../qt-ui/models.cpp" line="1507"/>
+        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1513"/>
         <source>Cyl</source>
         <translation>Cyl</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1464"/>
-        <location filename="../qt-ui/models.cpp" line="1510"/>
+        <location filename="../qt-ui/models.cpp" line="1470"/>
+        <location filename="../qt-ui/models.cpp" line="1516"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1473"/>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1527"/>
         <source>Max CNS</source>
         <translation>Maks CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
-        <location filename="../qt-ui/models.cpp" line="1524"/>
+        <location filename="../qt-ui/models.cpp" line="1482"/>
+        <location filename="../qt-ui/models.cpp" line="1530"/>
         <source>Location</source>
         <translation>Lokation</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>Depth(%1)</source>
         <translation>Dybde(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1449"/>
-        <location filename="../qt-ui/models.cpp" line="1495"/>
+        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1501"/>
         <source>Duration</source>
         <translation>Varighed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1498"/>
+        <location filename="../qt-ui/models.cpp" line="1504"/>
         <source>Temp(%1%2)</source>
         <translation>Temp(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1470"/>
-        <location filename="../qt-ui/models.cpp" line="1518"/>
+        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1524"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -2197,95 +2373,95 @@ fjerne den valgte dykkercomputer?</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="98"/>
         <source>no dives were selected</source>
         <translation>ingen dyk var valgt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="117"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>Kunne ikke danne zip fil til upload: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="143"/>
         <source>cannot create temporary file: %s</source>
         <translation>Kan ikke danne midlertidig fil: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/>
         <source>internal error: %s</source>
         <translation>Intern fejl: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="169"/>
         <source>internal error</source>
         <translation>Intern fejl</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="629"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="828"/>
         <source>Done</source>
         <translation>Færdig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/>
         <source>Uploading dive list...</source>
         <translation>Uploader dyk liste...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="692"/>
         <source>Downloading dive list...</source>
         <translation>Downloader dyk liste...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="741"/>
         <source>Downloading %1 dives...</source>
         <translation>Downloader %1 dyk...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="785"/>
         <source>Download finished - %1</source>
         <translation>Download færdig - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="802"/>
         <source>Corrupted download</source>
         <translation>Fejl i download</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Arkivet kunne i åbnes:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
         <source>Upload failed</source>
         <translation>Upload fejlede</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/>
         <source>Upload successful</source>
         <translation>Uploadet med succes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
         <source>Login failed</source>
         <translation>Login fejlede</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
         <source>Cannot parse response</source>
         <translation>Kan ikke fortolke svar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
         <source>Error: %1</source>
         <translation>Fejl: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="829"/>
         <source>Upload finished</source>
         <translation>Upload færdig</translation>
     </message>
@@ -2293,54 +2469,52 @@ fjerne den valgte dykkercomputer?</translation>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="169"/>
         <source>Error</source>
         <translation>Fejl</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="400"/>
         <source>Retry</source>
         <translation>Prøv igen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="264"/>
         <source>Find Uemis dive computer</source>
         <translation>Find Uemis dykker computer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Vælg logfil for computer download</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Log files (*.log)</source>
         <translation>Logfiler (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="362"/>
         <source>Warning</source>
         <translation>Advarsel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="363"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>Gem af libdivecomputer dump vil IKKE downloade dyk til listen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="374"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Vælg fil for dykkercomputerens binære dump fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="375"/>
         <source>Dump files (*.bin)</source>
         <translation>Dump filer (*.bin)</translation>
     </message>
@@ -2348,7 +2522,7 @@ fjerne den valgte dykkercomputer?</translation>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="101"/>
         <source>Vendor</source>
         <translation>Leverandør</translation>
     </message>
@@ -2358,54 +2532,74 @@ fjerne den valgte dykkercomputer?</translation>
         <translation>Download fra dykkercomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="31"/>
         <source>Device or mount point</source>
         <translation>Device or mount point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="111"/>
         <source>Dive computer</source>
         <translation>Dykkercomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="132"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="45"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="80"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="94"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="52"/>
         <source>Force download of all dives</source>
         <translation>Tving download af alle dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
         <source>Always prefer downloaded dives</source>
         <translation>Foretræk altid downloadede dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="189"/>
         <source>Cancel</source>
         <translation>Fortryd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/>
+        <source>Downloaded Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
+        <source>Select all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
+        <source>Unselect all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
         <source>Save libdivecomputer logfile</source>
         <translation>Gem libdivecomputer logfil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="87"/>
         <source>Save libdivecomputer dumpfile</source>
         <translation>Gem dumpfil fra libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
         <source>Download into new trip</source>
         <translation>Download til ny tur</translation>
     </message>
@@ -2413,12 +2607,12 @@ fjerne den valgte dykkercomputer?</translation>
 <context>
     <name>ExtraDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Key</source>
         <translation>Nøgle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Value</source>
         <translation>Værdi</translation>
     </message>
@@ -2432,21 +2626,21 @@ fjerne den valgte dykkercomputer?</translation>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="245"/>
-        <source>Your dive profile was updated to facebook.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
-        <source>Photo Upload Failed</source>
+        <source>Your dive profile was updated to Facebook.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="250"/>
-        <source>Your dive profile was not updated to facebook, 
+        <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+        <source>Photo Upload Failed</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>FilterWidget</name>
@@ -2487,17 +2681,17 @@ fjerne den valgte dykkercomputer?</translation>
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1544"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1621"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Denne facilitet er endnu ikke tilgængelig for den valgte computer</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1624"/>
         <source>Firmware update failed!</source>
         <translation>Firmware update fejlede</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1550"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1627"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Kunne ikke lave en forbindelse til dykker computeren</translation>
     </message>
@@ -2505,7 +2699,7 @@ fjerne den valgte dykkercomputer?</translation>
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="128"/>
+        <location filename="../qt-ui/globe.cpp" line="119"/>
         <source>Edit selected dive locations</source>
         <translation>Editer valgte dykker lokationer</translation>
     </message>
@@ -2513,7 +2707,7 @@ fjerne den valgte dykkercomputer?</translation>
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="566"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="549"/>
         <source>Location: </source>
         <translation>Sted:</translation>
     </message>
@@ -2521,7 +2715,7 @@ fjerne den valgte dykkercomputer?</translation>
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="286"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="283"/>
         <source>No location set</source>
         <translation>Stedet er ikke sat</translation>
     </message>
@@ -2529,330 +2723,335 @@ fjerne den valgte dykkercomputer?</translation>
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="133"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
+        <location filename="../qt-ui/maintab.cpp" line="497"/>
         <source>Location</source>
         <translation>Position</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="67"/>
         <source>Coordinates</source>
         <translation>Koordinater</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="169"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="154"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Buddy</source>
         <translation>Makker</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="222"/>
+        <location filename="../qt-ui/maintab.ui" line="277"/>
         <source>Tags</source>
         <translation>Tags</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="186"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
         <source>Rating</source>
         <translation>Bedømmelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="221"/>
         <source>Visibility</source>
         <translation>Sigtbarhed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="230"/>
         <source>Suit</source>
         <translation>Dragt</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="465"/>
+        <location filename="../qt-ui/maintab.cpp" line="470"/>
         <source>Dive notes</source>
         <translation>Dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
-        <location filename="../qt-ui/maintab.ui" line="648"/>
-        <location filename="../qt-ui/maintab.cpp" line="277"/>
+        <location filename="../qt-ui/maintab.ui" line="74"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="102"/>
+        <location filename="../qt-ui/maintab.ui" line="677"/>
+        <location filename="../qt-ui/maintab.cpp" line="279"/>
         <source>Air temp.</source>
         <translation>Luft temp.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <location filename="../qt-ui/maintab.ui" line="667"/>
-        <location filename="../qt-ui/maintab.cpp" line="278"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.ui" line="696"/>
+        <location filename="../qt-ui/maintab.cpp" line="280"/>
         <source>Water temp.</source>
         <translation>Vand temp.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="229"/>
-        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.ui" line="284"/>
+        <location filename="../qt-ui/maintab.cpp" line="498"/>
         <source>Notes</source>
         <translation>Noter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="369"/>
+        <location filename="../qt-ui/maintab.ui" line="398"/>
         <source>Equipment</source>
         <translation>Udstyr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="496"/>
+        <location filename="../qt-ui/maintab.ui" line="525"/>
         <source>Gases used</source>
         <translation>Brugt gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="515"/>
+        <location filename="../qt-ui/maintab.ui" line="544"/>
         <source>Gas consumed</source>
         <translation>Forbrugt gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="553"/>
+        <location filename="../qt-ui/maintab.ui" line="582"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="591"/>
+        <location filename="../qt-ui/maintab.ui" line="620"/>
         <source>Max. depth</source>
         <translation>Max dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="629"/>
+        <location filename="../qt-ui/maintab.ui" line="658"/>
         <source>Air pressure</source>
         <translation>Luft tryk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="686"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>Dive time</source>
         <translation>Dykker tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="845"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
         <source>Total time</source>
         <translation>Total tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="903"/>
+        <location filename="../qt-ui/maintab.ui" line="932"/>
         <source>Gas consumption</source>
         <translation>Gas forbrug</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="962"/>
+        <location filename="../qt-ui/maintab.ui" line="991"/>
         <source>Extra data</source>
         <translation>Ekstra data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="968"/>
+        <location filename="../qt-ui/maintab.ui" line="997"/>
         <source>Additional data from dive computer</source>
         <translation>Yderligere data fra dykker computeren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="54"/>
-        <location filename="../qt-ui/maintab.ui" line="458"/>
+        <location filename="../qt-ui/maintab.ui" line="83"/>
+        <location filename="../qt-ui/maintab.ui" line="487"/>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="61"/>
+        <location filename="../qt-ui/maintab.ui" line="90"/>
         <source>Time</source>
         <translation>Tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="425"/>
+        <location filename="../qt-ui/maintab.ui" line="454"/>
         <source>Dive info</source>
         <translation>Dyk info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="477"/>
+        <location filename="../qt-ui/maintab.ui" line="506"/>
         <source>Interval</source>
         <translation>Interval</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="534"/>
-        <location filename="../qt-ui/maintab.ui" line="799"/>
+        <location filename="../qt-ui/maintab.ui" line="563"/>
+        <location filename="../qt-ui/maintab.ui" line="828"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="610"/>
+        <location filename="../qt-ui/maintab.ui" line="639"/>
         <source>Avg. depth</source>
         <translation>Gnm dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="572"/>
+        <location filename="../qt-ui/maintab.ui" line="601"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="734"/>
         <source>Salinity</source>
         <translation>Saltindhold</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="742"/>
+        <location filename="../qt-ui/maintab.ui" line="771"/>
         <source>Stats</source>
         <translation>Statistik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="775"/>
+        <location filename="../qt-ui/maintab.ui" line="804"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="787"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="813"/>
+        <location filename="../qt-ui/maintab.ui" line="842"/>
         <source>Duration</source>
         <translation>Varighed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="864"/>
+        <location filename="../qt-ui/maintab.ui" line="893"/>
         <source>Dives</source>
         <translation>Dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="948"/>
+        <location filename="../qt-ui/maintab.ui" line="977"/>
         <source>Photos</source>
         <translation>Fotos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="95"/>
+        <location filename="../qt-ui/maintab.cpp" line="87"/>
         <source>Cylinders</source>
         <translation>Flasker </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="99"/>
+        <location filename="../qt-ui/maintab.cpp" line="91"/>
         <source>Weights</source>
         <translation>Vægt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="55"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Apply changes</source>
         <translation>Gem ændringer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="59"/>
+        <location filename="../qt-ui/maintab.cpp" line="50"/>
         <source>Discard changes</source>
         <translation>Drop ændringer </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="96"/>
+        <location filename="../qt-ui/maintab.cpp" line="88"/>
         <source>Add cylinder</source>
         <translation>Tilføj flaske</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="100"/>
+        <location filename="../qt-ui/maintab.cpp" line="92"/>
         <source>Add weight system</source>
         <translation>Tilføj vægt system</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="274"/>
+        <location filename="../qt-ui/maintab.cpp" line="276"/>
         <source>Air temp. [%1]</source>
         <translation>Luft temp. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="275"/>
+        <location filename="../qt-ui/maintab.cpp" line="277"/>
         <source>Water temp. [%1]</source>
         <translation>Vand temp. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="312"/>
+        <location filename="../qt-ui/maintab.cpp" line="314"/>
         <source>This trip is being edited.</source>
         <translation>Turen er ved at blive rettet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="320"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Multiple dives are being edited.</source>
         <translation>Flere dyk bliver rettet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.cpp" line="324"/>
         <source>This dive is being edited.</source>
         <translation>Dette dyk bliver rettet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="436"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
+        <location filename="../qt-ui/maintab.cpp" line="465"/>
         <source>Trip notes</source>
         <translation>Tur notater</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="458"/>
+        <location filename="../qt-ui/maintab.cpp" line="463"/>
         <source>Trip location</source>
         <translation>Tur lokation</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="526"/>
-        <location filename="../qt-ui/maintab.cpp" line="558"/>
-        <location filename="../qt-ui/maintab.cpp" line="562"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
         <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="574"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="555"/>
+        <location filename="../qt-ui/maintab.cpp" line="563"/>
         <source>Deepest dive</source>
         <translation>Dybeste dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="556"/>
+        <location filename="../qt-ui/maintab.cpp" line="564"/>
         <source>Shallowest dive</source>
         <translation>Laveste dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="569"/>
+        <location filename="../qt-ui/maintab.cpp" line="577"/>
         <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="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="578"/>
         <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="571"/>
+        <location filename="../qt-ui/maintab.cpp" line="579"/>
         <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="582"/>
+        <location filename="../qt-ui/maintab.cpp" line="590"/>
         <source>Highest temperature</source>
         <translation>Højeste temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="583"/>
+        <location filename="../qt-ui/maintab.cpp" line="591"/>
         <source>Lowest temperature</source>
         <translation>Laveste temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="584"/>
+        <location filename="../qt-ui/maintab.cpp" line="592"/>
         <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="594"/>
+        <location filename="../qt-ui/maintab.cpp" line="602"/>
         <source>Longest dive</source>
         <translation>Længste dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="595"/>
+        <location filename="../qt-ui/maintab.cpp" line="603"/>
         <source>Shortest dive</source>
         <translation>Korteste dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="596"/>
+        <location filename="../qt-ui/maintab.cpp" line="604"/>
         <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="620"/>
+        <location filename="../qt-ui/maintab.cpp" line="628"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -2861,17 +3060,17 @@ blandes fra Luft ved brug:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="624"/>
+        <location filename="../qt-ui/maintab.cpp" line="632"/>
         <source> and </source>
         <translation>og</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="911"/>
+        <location filename="../qt-ui/maintab.cpp" line="925"/>
         <source>Discard the changes?</source>
         <translation>Drop ændringerne?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="912"/>
+        <location filename="../qt-ui/maintab.cpp" line="926"/>
         <source>You are about to discard your changes.</source>
         <translation>Du er ved at droppe dine ændringer.</translation>
     </message>
@@ -3018,7 +3217,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="296"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="232"/>
         <source>Open</source>
         <translation>Åben</translation>
     </message>
@@ -3378,90 +3577,90 @@ p, li { white-space: pre-wrap; }
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="252"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="229"/>
         <source>Open file</source>
         <translation>Åben fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="256"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="233"/>
         <source>Cancel</source>
         <translation>Fortryd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="332"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="309"/>
         <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="444"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
         <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="491"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
         <source>Print runtime table</source>
         <translation>Print runtime skema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="834"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="811"/>
         <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="836"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="813"/>
         <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="841"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="818"/>
         <source>Save changes?</source>
         <translation>Gem ændringer?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1196"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1173"/>
         <source>Save file as</source>
         <translation>Gem fil som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1337"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1314"/>
         <source>Open dive log file</source>
         <translation>Åben log fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="819"/>
         <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="300"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="444"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="277"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Warning</source>
         <translation>Advarsel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1180"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1157"/>
         <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="625"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="602"/>
         <source>Yearly statistics</source>
         <translation>Årlig statistik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1197"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1174"/>
         <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="1338"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1315"/>
         <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <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>
@@ -3469,7 +3668,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="651"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="634"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Filtrer visning %1(af %2) dyk</translation>
     </message>
@@ -3477,39 +3676,39 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="239"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="243"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="244"/>
         <source>Not now</source>
         <translation>Ikke nu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="245"/>
         <source>Update firmware</source>
         <translation>Opdater firmware</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
         <source>Firmware upgrade notice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
         <source>Save the downloaded firmware as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
         <source>HEX files (*.hex)</source>
         <translation>HEX filer (*.hex)</translation>
     </message>
@@ -3517,54 +3716,69 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Open circuit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>ft/min</source>
         <translation>f/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="481"/>
         <source>Last stop at 20ft</source>
         <translation>Sidste stop på 20f</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="482"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% gnm. dybde til 20ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="489"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
         <source>20ft to surface</source>
         <translation>20ft til overflade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="485"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
         <source>Last stop at 6m</source>
         <translation>Sidste stop på 6 meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% gnm. dybde til 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="494"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
         <source>6m to surface</source>
         <translation>6m til overflade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="497"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="498"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
         <source>cuft/min</source>
         <translation>cuft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="506"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="507"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="500"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="501"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
@@ -3683,6 +3897,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="816"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -3717,57 +3932,87 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="795"/>
+        <source>CCR: Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="809"/>
+        <source>Default CCR set-point for dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="832"/>
+        <source>pSCR O₂ metabolism rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="839"/>
+        <source>pSCR ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="846"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="859"/>
+        <source>1:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="875"/>
         <source>System default</source>
         <translation>System standard</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="843"/>
+        <location filename="../qt-ui/preferences.ui" line="914"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="849"/>
+        <location filename="../qt-ui/preferences.ui" line="920"/>
         <source>Proxy type</source>
         <translation>Proxy type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="862"/>
+        <location filename="../qt-ui/preferences.ui" line="933"/>
         <source>Host</source>
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="888"/>
+        <location filename="../qt-ui/preferences.ui" line="959"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="914"/>
+        <location filename="../qt-ui/preferences.ui" line="985"/>
         <source>Requires authentication</source>
         <translation>Kræver godkendelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="934"/>
+        <location filename="../qt-ui/preferences.ui" line="1005"/>
         <source>Username</source>
         <translation>Brugernavn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="957"/>
+        <location filename="../qt-ui/preferences.ui" line="1028"/>
         <source>Password</source>
         <translation>Password</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="985"/>
-        <source>about:blank</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="1011"/>
-        <source>Disconnect from facebook</source>
+        <location filename="../qt-ui/preferences.ui" line="1079"/>
+        <source>Disconnect from Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="824"/>
+        <location filename="../qt-ui/preferences.ui" line="895"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
@@ -3922,52 +4167,52 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>GFHøj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="28"/>
+        <location filename="../qt-ui/preferences.cpp" line="44"/>
         <source>No proxy</source>
         <translation>Ingen proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="29"/>
+        <location filename="../qt-ui/preferences.cpp" line="45"/>
         <source>System proxy</source>
         <translation>System proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="30"/>
+        <location filename="../qt-ui/preferences.cpp" line="46"/>
         <source>HTTP proxy</source>
         <translation>HTTP proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="31"/>
+        <location filename="../qt-ui/preferences.cpp" line="47"/>
         <source>SOCKS proxy</source>
         <translation>SOCKS proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="291"/>
+        <location filename="../qt-ui/preferences.cpp" line="324"/>
         <source>Restart required</source>
         <translation>Genstart nødvendigt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="292"/>
+        <location filename="../qt-ui/preferences.cpp" line="325"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>Valg af nyt sprog vil kræve en genstart af Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="456"/>
+        <location filename="../qt-ui/preferences.cpp" line="494"/>
         <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
         <translation>Hvis du klikker OK, vil alle indstillinger bliver set til deres standard værdier. Dette vil ske øjeblikkeligt. </translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML filer (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Open default log file</source>
         <translation>Åben standard log fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="455"/>
+        <location filename="../qt-ui/preferences.cpp" line="493"/>
         <source>Warning</source>
         <translation>Advarsel</translation>
     </message>
@@ -3975,17 +4220,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="91"/>
+        <location filename="../qt-ui/printdialog.cpp" line="85"/>
         <source>&amp;Preview</source>
         <translation>&amp;Vis Udskrift</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="88"/>
+        <location filename="../qt-ui/printdialog.cpp" line="82"/>
         <source>P&amp;rint</source>
         <translation>U&amp;dskriv</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="103"/>
+        <location filename="../qt-ui/printdialog.cpp" line="97"/>
         <source>Print</source>
         <translation>Udskriv:</translation>
     </message>
@@ -3993,42 +4238,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="20"/>
         <source>Dive#</source>
         <translation>Dyk#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="21"/>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="22"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="23"/>
         <source>Duration</source>
         <translation>Varighed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Master</source>
         <translation>Master</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Buddy</source>
         <translation>Makker</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="34"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Location</source>
         <translation>Sted</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <location filename="../qt-ui/printlayout.cpp" line="63"/>
         <source>Subsurface cannot find a usable printer on this system!</source>
         <translation>Subsurface kan ikke finde en printer</translation>
     </message>
@@ -4094,72 +4339,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2095"/>
+        <location filename="../qt-ui/models.cpp" line="2101"/>
         <source>unknown</source>
         <translation>Ukendt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2100"/>
+        <location filename="../qt-ui/models.cpp" line="2106"/>
         <source>Dive #%1 - %2</source>
         <translation>Dyk #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2103"/>
+        <location filename="../qt-ui/models.cpp" line="2109"/>
         <source>Max depth: %1 %2</source>
         <translation>Max dybde: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2110"/>
+        <location filename="../qt-ui/models.cpp" line="2116"/>
         <source>Duration: %1 min</source>
         <translation>Varighed: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2115"/>
+        <location filename="../qt-ui/models.cpp" line="2121"/>
         <source>Gas used:</source>
         <translation>Brugt gas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2117"/>
+        <location filename="../qt-ui/models.cpp" line="2123"/>
         <source>Tags:</source>
         <translation>Tags:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2119"/>
+        <location filename="../qt-ui/models.cpp" line="2125"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2121"/>
+        <location filename="../qt-ui/models.cpp" line="2127"/>
         <source>Weights:</source>
         <translation>Vægt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2126"/>
+        <location filename="../qt-ui/models.cpp" line="2132"/>
         <source>Notes:</source>
         <translation>Noter:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2133"/>
+        <location filename="../qt-ui/models.cpp" line="2139"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2135"/>
+        <location filename="../qt-ui/models.cpp" line="2141"/>
         <source>Buddy:</source>
         <translation>Makker:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2137"/>
+        <location filename="../qt-ui/models.cpp" line="2143"/>
         <source>Suit:</source>
         <translation>Dragt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2139"/>
+        <location filename="../qt-ui/models.cpp" line="2145"/>
         <source>Viz:</source>
         <translation>Sigt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2141"/>
+        <location filename="../qt-ui/models.cpp" line="2147"/>
         <source>Rating:</source>
         <translation>Vurdering:</translation>
     </message>
@@ -4167,103 +4412,108 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="628"/>
         <source> (#%1 of %2)</source>
         <translation> (#%1 af %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="630"/>
+        <source>Unknown dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="647"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>Vis NDL / TTS blev slået fra, da det tog for lang tid at danne den.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1168"/>
         <source>Make first divecomputer</source>
         <translation>Vælg som 1. dykkercomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Delete this divecomputer</source>
         <translation>Slet denne dykkercomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1184"/>
         <source>Add gas change</source>
         <translation>Tilføj gas skift</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1187"/>
         <source> (Tank %1)</source>
         <translation>(Flaske %1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1195"/>
         <source>Add set-point change</source>
         <translation>Tilføj set-point skift</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1197"/>
         <source>Add bookmark</source>
         <translation>Tilføj bookmark</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
         <source>Remove event</source>
         <translation>Slet hændelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1206"/>
         <source>Hide similar events</source>
         <translation>Skjul tilsvarende hændelser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1213"/>
         <source>Edit name</source>
         <translation>Rediger navn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1242"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1249"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1264"/>
         <source>Unhide all events</source>
         <translation>Vis alle hændelser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide events</source>
         <translation>Skjul hændelser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide all %1 events?</source>
         <translation>Skjul alle %1 hændelser?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1333"/>
         <source>Remove the selected event?</source>
         <translation>Fjern de valgte hændelser?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1334"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1424"/>
         <source>Edit name of bookmark</source>
         <translation>Rediger bogmærke navn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
         <source>Custom name:</source>
         <translation>Brugerdefineret navn:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1430"/>
         <source>Name is too long!</source>
         <translation>Navn er for langt!</translation>
     </message>
@@ -4271,102 +4521,102 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>AIR</source>
         <translation>LUFT</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>OXYGEN</source>
         <translation>ILT</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="208"/>
         <source>Remove this point</source>
         <translation>Fjern dette punkt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="57"/>
         <source>Close</source>
         <translation>Luk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="42"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="25"/>
         <source>Average</source>
         <translation>Gennemsnit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="45"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="28"/>
         <source>Minimum</source>
         <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="48"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="31"/>
         <source>Maximum</source>
         <translation>Maksimal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="297"/>
+        <location filename="../qt-ui/globe.cpp" line="296"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>Naviger på kortet og dobbelt klik for at sætte lokationen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="525"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="526"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="550"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="551"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="570"/>
+        <location filename="../qt-ui/models.cpp" line="574"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="571"/>
+        <location filename="../qt-ui/models.cpp" line="575"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="595"/>
+        <location filename="../qt-ui/models.cpp" line="599"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="596"/>
+        <location filename="../qt-ui/models.cpp" line="600"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="513"/>
         <source>Invalid response from server</source>
         <translation>Ugyldigt svar fra serveren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation>Forventet XML tag &apos;DiveDateReader&apos;, fik istedet &apos;%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="567"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation>Forventet XML tag &apos;DiveDates&apos; ikke fundet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Ugyldig XML svar. Linje %1: %2</translation>
     </message>
@@ -4374,12 +4624,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1450"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1518"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Denne facilitet er endnu ikke tilgængelig for den valgte computer</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1442"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Kunne ikke lave en forbindelse til dykker computeren</translation>
     </message>
@@ -4393,12 +4643,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
-        <location filename="../qt-ui/simplewidgets.cpp" line="151"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="134"/>
         <source>New starting number</source>
         <translation>Nyt start nummer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="149"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="132"/>
         <source>New number</source>
         <translation>Nyt nummer</translation>
     </message>
@@ -4406,12 +4656,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1575"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1653"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Denne facilitet er endnu ikke tilgængelig for den valgte computer</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1579"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1657"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Kunne ikke lave en forbindelse til dykker computeren</translation>
     </message>
@@ -4490,12 +4740,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Hvilke dato/tid er vist på billedet?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="276"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="259"/>
         <source>Open image file</source>
         <translation>Åben billede til</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="278"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="261"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Billede filer (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -4548,10 +4798,9 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <name>SocialNetworkDialog</name>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="282"/>
-        <source>Dive Date: %1 
+        <source>Dive date: %1 
 </source>
-        <translation>Dyk Dato: %1 
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="285"/>
@@ -4574,7 +4823,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="290"/>
-        <source>Dive Location: %1 
+        <source>Dive location: %1 
 </source>
         <translation type="unfinished"/>
     </message>
@@ -4692,47 +4941,47 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="329"/>
         <source>Webservice</source>
         <translation>Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="393"/>
         <source>Connecting...</source>
         <translation>Forbinder...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
         <source>Download finished</source>
         <translation>Download færdig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Download error: %1</source>
         <translation>Download fejl; %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="436"/>
         <source>Connection error: </source>
         <translation>Forbindelse fejl:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
         <source>Download successful</source>
         <translation>Download succes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="439"/>
         <source>Invalid user identifier!</source>
         <translation>Ugyldig bruger id</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="312"/>
         <source>Enter User ID and click Download</source>
         <translation>Indtast bruger ID og klik Download</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="442"/>
         <source>Cannot parse response!</source>
         <translation>Kan ikke fortolke svar!</translation>
     </message>
@@ -4740,7 +4989,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="592"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="575"/>
         <source>Suits: </source>
         <translation>Dragte:</translation>
     </message>
@@ -4748,7 +4997,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="119"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="116"/>
         <source>No suit set</source>
         <translation type="unfinished"/>
     </message>
@@ -4765,7 +5014,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="513"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="496"/>
         <source>Tags: </source>
         <translation>Tags:</translation>
     </message>
@@ -4773,7 +5022,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="144"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="141"/>
         <source>Empty tags</source>
         <translation type="unfinished"/>
     </message>
@@ -4781,17 +5030,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>Description</source>
         <translation>Beskrivelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -4799,7 +5048,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="141"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="131"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
@@ -4807,7 +5056,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1090"/>
+        <location filename="../qt-ui/models.cpp" line="1094"/>
         <source> (%1 shown)</source>
         <translation>(%1 vist)</translation>
     </message>
@@ -4815,72 +5064,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="64"/>
         <source>Check for updates.</source>
         <translation>Tjek for opdateringer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="66"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface kunne ikke tjekke for opdateringer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="70"/>
         <source>The following error occurred:</source>
         <translation>Følgende fejl opstod:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="72"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
         <source>Please check your internet connection.</source>
         <translation>Tjek din internet forbindelse.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="85"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="84"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>Du anvender den nyeste version af Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="88"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>En ny version af Subsurface er tilgængelig.&lt;br/&gt;Klik på:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; for at downloade den.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="95"/>
         <source>A new version of Subsurface is available.</source>
         <translation>En ny version af Subsurface er tilgængelig.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="97"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
         <source>Latest version is %1, please check with your OS vendor for updates.</source>
         <translation>Nyeste version er %s, tjek venligst med din OS leverandør for opdateringer.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="103"/>
         <source>Newest release version is </source>
         <translation>Nyeste udgave er</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="105"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
         <source>The server returned the following information:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="121"/>
         <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
         <source>Decline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="124"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
         <source>Accept</source>
         <translation>Accept</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="126"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="125"/>
         <source>Automatic check for updates</source>
         <translation type="unfinished"/>
     </message>
@@ -4888,13 +5137,13 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UserManual</name>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="55"/>
+        <location filename="../qt-ui/usermanual.cpp" line="54"/>
         <source>User Manual</source>
         <translation>Brugermanual</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="72"/>
-        <location filename="../qt-ui/usermanual.cpp" line="78"/>
+        <location filename="../qt-ui/usermanual.cpp" line="71"/>
+        <location filename="../qt-ui/usermanual.cpp" line="77"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Kan ikke finde Subsurface manualen</translation>
     </message>
@@ -4972,85 +5221,85 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
         <source>
 Operating System: %1</source>
         <translation>
 Operativ System: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 CPU Arkitektur: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 Language: %1</source>
         <translation>
 Sprog: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="93"/>
         <source>Should we ask you later?</source>
         <translation>Skal vi spørge dig senere?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Don&apos;t ask me again</source>
         <translation>Spørg ikke igen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Ask later</source>
         <translation>Spørg senere</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
         <source>Submit user survey.</source>
         <translation>Gem undersøgelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask again?</source>
         <translation>Spørg igen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="17"/>
         <source>Send</source>
         <translation>Send</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>
 OS CPU Arkitektur: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation>Subsurface kunne ikke sende bruger undersøgelsen.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="121"/>
         <source>The following error occurred:</source>
         <translation>Følgende fejl opstod:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>Please check your internet connection.</source>
         <translation>Tjek din internet forbindelselse.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="131"/>
         <source>Survey successfully submitted.</source>
         <translation>Undersøgelsen er sendt med succes.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="136"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation>Der opstod en fejl da der blev tjekket for opdateringer.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -5058,12 +5307,12 @@ OS CPU Arkitektur: %1</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>Description</source>
         <translation>Beskrivelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -5111,12 +5360,12 @@ OS CPU Arkitektur: %1</translation>
         <translation>Upload</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="247"/>
         <source>Operation timed out</source>
         <translation>Tiden er udløbet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="268"/>
         <source>Transferring data...</source>
         <translation>Overfører data...</translation>
     </message>
@@ -5124,17 +5373,17 @@ OS CPU Arkitektur: %1</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Weight</source>
         <translation>Vægt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="496"/>
+        <location filename="../qt-ui/models.cpp" line="500"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Et klik her vil fjerne dette vægt system.</translation>
     </message>
@@ -5142,19 +5391,19 @@ OS CPU Arkitektur: %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1479"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1487"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1497"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1555"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1566"/>
         <source>Failed!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1506"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1576"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Denne facilitet er endnu ikke tilgængelig for den valgte computer</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1580"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Kunne ikke lave en forbindelse til dykker computeren</translation>
     </message>
@@ -5162,79 +5411,79 @@ OS CPU Arkitektur: %1</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1841"/>
+        <location filename="../qt-ui/models.cpp" line="1847"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>År
 &gt;Måned / Tur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1844"/>
+        <location filename="../qt-ui/models.cpp" line="1850"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1847"/>
+        <location filename="../qt-ui/models.cpp" line="1853"/>
         <source>Duration 
  Total</source>
         <translation>Varighed
 Ialt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1850"/>
+        <location filename="../qt-ui/models.cpp" line="1856"/>
         <source>
 Average</source>
         <translation>
 Gennemsnit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1853"/>
+        <location filename="../qt-ui/models.cpp" line="1859"/>
         <source>
 Shortest</source>
         <translation>
 Kortest</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1856"/>
+        <location filename="../qt-ui/models.cpp" line="1862"/>
         <source>
 Longest</source>
         <translation>
 Længst</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1859"/>
+        <location filename="../qt-ui/models.cpp" line="1865"/>
         <source>Depth (%1)
  Average</source>
         <translation>Dybde (%1)
 Gennemsnit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1862"/>
-        <location filename="../qt-ui/models.cpp" line="1871"/>
-        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>
 Minimum</source>
         <translation>
 Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1865"/>
-        <location filename="../qt-ui/models.cpp" line="1874"/>
-        <location filename="../qt-ui/models.cpp" line="1883"/>
+        <location filename="../qt-ui/models.cpp" line="1871"/>
+        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>
 Maximum</source>
         <translation>
 Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1874"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Gennemsnit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1883"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -5315,40 +5564,40 @@ Gennemsnit</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1508"/>
+        <location filename="../dive.c" line="1530"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) eller (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="464"/>
+        <location filename="../divelist.c" line="467"/>
         <location filename="../equipment.c" line="81"/>
-        <location filename="../planner.c" line="1060"/>
-        <location filename="../planner.c" line="1063"/>
+        <location filename="../planner.c" line="1081"/>
+        <location filename="../planner.c" line="1084"/>
         <source>air</source>
         <translation>luft</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="192"/>
+        <location filename="../equipment.c" line="194"/>
         <source>integrated</source>
         <translation>integreret</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="193"/>
+        <location filename="../equipment.c" line="195"/>
         <source>belt</source>
         <translation>bælte</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="194"/>
+        <location filename="../equipment.c" line="196"/>
         <source>ankle</source>
         <translation>ankel</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="195"/>
+        <location filename="../equipment.c" line="197"/>
         <source>backplate weight</source>
         <translation>bagpladevægt</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="196"/>
+        <location filename="../equipment.c" line="198"/>
         <source>clip-on</source>
         <translation>Clip-On</translation>
     </message>
@@ -5356,7 +5605,7 @@ Gennemsnit</translation>
         <location filename="../file.c" line="112"/>
         <location filename="../file.c" line="434"/>
         <location filename="../file.c" line="506"/>
-        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="925"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Fejl i læsning af &apos;%s&apos;</translation>
     </message>
@@ -5413,9 +5662,9 @@ Gennemsnit</translation>
         <translation>Ingen DC passer til filen &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../file.c" line="869"/>
-        <location filename="../file.c" line="909"/>
-        <location filename="../file.c" line="1007"/>
+        <location filename="../file.c" line="870"/>
+        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="1016"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>Maksimum antal kolonner i CSV import er %d</translation>
     </message>
@@ -5586,27 +5835,27 @@ Gennemsnit</translation>
         <translation>Ugyldigt hændelses nummer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="421"/>
+        <location filename="../libdivecomputer.c" line="419"/>
         <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="427"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Error registering the data</source>
         <translation>Fejl i registrering af data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="433"/>
         <source>Error parsing the datetime</source>
         <translation>Fejl ved fortolkning af dato/tid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Dive %d: %s</source>
         <translation>Dyk %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="455"/>
+        <location filename="../libdivecomputer.c" line="454"/>
         <source>Error parsing the divetime</source>
         <translation>Fejl i fortolkning af dykkertid</translation>
     </message>
@@ -5616,156 +5865,156 @@ Gennemsnit</translation>
         <translation>Fejl i fortolkning af max dybde</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="482"/>
+        <location filename="../libdivecomputer.c" line="483"/>
         <source>Error parsing temperature</source>
         <translation>Fejl ved læsning af temperatur</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="501"/>
+        <location filename="../libdivecomputer.c" line="503"/>
         <source>Error parsing the gas mix count</source>
         <translation>Fejl i fortolkning af antallet af gasser</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="513"/>
+        <location filename="../libdivecomputer.c" line="515"/>
         <source>Error obtaining water salinity</source>
         <translation>Fejl i læsning af saltindhold i vandet</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="521"/>
+        <location filename="../libdivecomputer.c" line="524"/>
         <source>Error obtaining surface pressure</source>
         <translation>Fejl ved at opnå overflade tryk</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="545"/>
+        <location filename="../libdivecomputer.c" line="549"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="562"/>
+        <location filename="../libdivecomputer.c" line="569"/>
         <source>Error parsing the gas mix</source>
         <translation>Fejl i fortolkning af gas blanding</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="569"/>
+        <location filename="../libdivecomputer.c" line="576"/>
         <source>Error parsing the samples</source>
         <translation>Fejl i fortolkning af prøver</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="706"/>
+        <location filename="../libdivecomputer.c" line="713"/>
         <source>Event: waiting for user action</source>
         <translation>Event: waiting for user action</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="714"/>
+        <location filename="../libdivecomputer.c" line="721"/>
         <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="778"/>
+        <location filename="../libdivecomputer.c" line="785"/>
         <source>Error registering the event handler.</source>
         <translation>Fejl: registering the event handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="783"/>
+        <location filename="../libdivecomputer.c" line="790"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Fejl: registering the cancellation handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="804"/>
+        <location filename="../libdivecomputer.c" line="811"/>
         <source>Dive data import error</source>
         <translation>Import fejl i dykker data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="843"/>
+        <location filename="../libdivecomputer.c" line="850"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Kan ikke danne libdivecomputer context</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="850"/>
+        <location filename="../libdivecomputer.c" line="857"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Kan ikke åbne %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="858"/>
+        <location filename="../libdivecomputer.c" line="865"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Utilstrækkelige privilegier til at åbne enheden %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="506"/>
+        <location filename="../parse-xml.c" line="516"/>
         <source>Strange percentage reading %s
 </source>
         <translation> Mærkelig procent læsning %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1760"/>
+        <location filename="../parse-xml.c" line="1770"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Fejl i fortolkning af &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1989"/>
-        <location filename="../parse-xml.c" line="2137"/>
+        <location filename="../parse-xml.c" line="1999"/>
+        <location filename="../parse-xml.c" line="2147"/>
         <source>Database query dm4_events failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1996"/>
-        <location filename="../parse-xml.c" line="2144"/>
+        <location filename="../parse-xml.c" line="2006"/>
+        <location filename="../parse-xml.c" line="2154"/>
         <source>Database query dm4_tags failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2318"/>
+        <location filename="../parse-xml.c" line="2328"/>
         <source>Database query shearwater_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2325"/>
+        <location filename="../parse-xml.c" line="2335"/>
         <source>Database query shearwater_changes failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2332"/>
+        <location filename="../parse-xml.c" line="2342"/>
         <source>Database query shearwater_profile_sample failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2451"/>
+        <location filename="../parse-xml.c" line="2461"/>
         <source>Database query cobalt_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2458"/>
+        <location filename="../parse-xml.c" line="2468"/>
         <source>Database query cobalt_buddies failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2465"/>
+        <location filename="../parse-xml.c" line="2475"/>
         <source>Database query cobalt_visibility failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2472"/>
+        <location filename="../parse-xml.c" line="2482"/>
         <source>Database query cobalt_location failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2479"/>
+        <location filename="../parse-xml.c" line="2489"/>
         <source>Database query cobalt_location (site) failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2486"/>
+        <location filename="../parse-xml.c" line="2496"/>
         <source>Database query cobalt_profile_sample failed.
 </source>
         <translation type="unfinished"/>
@@ -5778,17 +6027,17 @@ Gennemsnit</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2168"/>
-        <location filename="../parse-xml.c" line="2189"/>
-        <location filename="../parse-xml.c" line="2508"/>
-        <location filename="../parse-xml.c" line="2527"/>
+        <location filename="../parse-xml.c" line="2178"/>
+        <location filename="../parse-xml.c" line="2199"/>
+        <location filename="../parse-xml.c" line="2518"/>
+        <location filename="../parse-xml.c" line="2537"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Database forespørgsel fejlede &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2848"/>
+        <location filename="../parse-xml.c" line="2909"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Kan ikke åbne stylesheet %s</translation>
     </message>
@@ -5798,161 +6047,167 @@ Gennemsnit</translation>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="820"/>
+        <location filename="../planner.c" line="841"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Kan ikke finde gas %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="356"/>
+        <location filename="../planner.c" line="363"/>
         <source>Too many gas mixes</source>
         <translation>For mange gas blandinger</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="540"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="548"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation>Baseret på GFlow = %d og GFhigh = %d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="544"/>
+        <location filename="../planner.c" line="551"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface dykker plan</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="548"/>
+        <location filename="../planner.c" line="555"/>
         <source>depth</source>
         <translation>dybde</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="558"/>
         <source>runtime</source>
         <translation>runtime</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="554"/>
+        <location filename="../planner.c" line="561"/>
         <source>duration</source>
         <translation>varighed</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="557"/>
+        <location filename="../planner.c" line="564"/>
         <source>gas</source>
         <translation>gas</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="594"/>
+        <location filename="../planner.c" line="601"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="602"/>
+        <location filename="../planner.c" line="609"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Overgang til %.*f %s i %d:%02d min - runtime %d:%02u på %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="615"/>
+        <location filename="../planner.c" line="622"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="622"/>
+        <location filename="../planner.c" line="629"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Stop på %.*f %s for %d:%02d min - runtime %d:%02u on %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="635"/>
+        <location filename="../planner.c" line="642"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="638"/>
-        <location filename="../planner.c" line="642"/>
+        <location filename="../planner.c" line="645"/>
+        <location filename="../planner.c" line="649"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="651"/>
+        <location filename="../planner.c" line="658"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="676"/>
+        <location filename="../planner.c" line="683"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Skift gas til %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="678"/>
+        <location filename="../planner.c" line="685"/>
         <source>Switch gas to %s</source>
         <translation>Skift gas til %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="697"/>
+        <location filename="../planner.c" line="704"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="699"/>
+        <location filename="../planner.c" line="706"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="710"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Gas forbrug (CCR etaper udeladt)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="705"/>
+        <location filename="../planner.c" line="712"/>
         <source>Gas consumption:</source>
         <translation>Gas forbrug:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="535"/>
-        <location filename="../planner.c" line="725"/>
-        <location filename="../planner.c" line="730"/>
-        <location filename="../planner.c" line="753"/>
+        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="732"/>
+        <location filename="../planner.c" line="737"/>
+        <location filename="../planner.c" line="762"/>
+        <location filename="../planner.c" line="772"/>
         <source>Warning:</source>
         <translation>Advarsel:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="523"/>
+        <location filename="../planner.c" line="530"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="726"/>
+        <location filename="../planner.c" line="733"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>det er mere gas end der er tilrådighed i flasken!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="731"/>
+        <location filename="../planner.c" line="738"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>Ikke ekstra gas nok til deling ved opstigning</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="733"/>
+        <location filename="../planner.c" line="740"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s i planlagt opstigning)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="735"/>
+        <location filename="../planner.c" line="742"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s under planlagt opstigning) af %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="759"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>høj pO₂ værdi %.2f at %d:%02u med gas %s på dybde %.*f %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="1064"/>
+        <location filename="../planner.c" line="769"/>
+        <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="1085"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1099"/>
+        <location filename="../profile.c" line="1113"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -5962,7 +6217,7 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1102"/>
+        <location filename="../profile.c" line="1116"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
@@ -5970,21 +6225,21 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1106"/>
+        <location filename="../profile.c" line="1120"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1112"/>
+        <location filename="../profile.c" line="1126"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1115"/>
+        <location filename="../profile.c" line="1129"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
@@ -5992,42 +6247,42 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1117"/>
+        <location filename="../profile.c" line="1131"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1119"/>
+        <location filename="../profile.c" line="1133"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1121"/>
+        <location filename="../profile.c" line="1135"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1123"/>
+        <location filename="../profile.c" line="1137"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1140"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1147"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -6036,7 +6291,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1137"/>
+        <location filename="../profile.c" line="1151"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -6045,143 +6300,143 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1149"/>
+        <location filename="../profile.c" line="1163"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Sikkerhedsstop: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1152"/>
+        <location filename="../profile.c" line="1166"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Sikkerhedsstop: ukendt tid @ %.0f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1157"/>
+        <location filename="../profile.c" line="1171"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1174"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deko: unkn time @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1178"/>
         <source>In deco
 </source>
         <translation>I deko
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1166"/>
+        <location filename="../profile.c" line="1180"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1183"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1172"/>
+        <location filename="../profile.c" line="1186"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1180"/>
+        <location filename="../profile.c" line="1194"/>
         <source>In deco (calc)
 </source>
         <translation>In deko (beregn)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1196"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (beregn)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1185"/>
+        <location filename="../profile.c" line="1199"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (beregn)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1188"/>
+        <location filename="../profile.c" line="1202"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Beregnet loft %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1194"/>
+        <location filename="../profile.c" line="1208"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Væv %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1214"/>
         <source>heartbeat: %d
 </source>
         <translation>Hjertefrekvens: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1202"/>
+        <location filename="../profile.c" line="1216"/>
         <source>bearing: %d
 </source>
         <translation>bærende: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1205"/>
+        <location filename="../profile.c" line="1219"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1314"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1304"/>
-        <location filename="../profile.c" line="1308"/>
-        <location filename="../profile.c" line="1312"/>
+        <location filename="../profile.c" line="1318"/>
+        <location filename="../profile.c" line="1322"/>
+        <location filename="../profile.c" line="1326"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1316"/>
+        <location filename="../profile.c" line="1330"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1334"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1324"/>
-        <location filename="../profile.c" line="1328"/>
+        <location filename="../profile.c" line="1338"/>
+        <location filename="../profile.c" line="1342"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1335"/>
+        <location filename="../profile.c" line="1349"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s
 </translation>
@@ -6313,6 +6568,7 @@ EADD: %d%s
     </message>
     <message>
         <location filename="../dive.c" line="30"/>
+        <location filename="../equipment.c" line="85"/>
         <source>oxygen</source>
         <translation>ilt</translation>
     </message>
@@ -6367,97 +6623,97 @@ EADD: %d%s
         <translation>(ingen dyk)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sun</source>
         <translation>Søn</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Mon</source>
         <translation>Man</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Tue</source>
         <translation>Tir</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Wed</source>
         <translation>Ons</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Thu</source>
         <translation>Tor</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Fri</source>
         <translation>Fre</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sat</source>
         <translation>Lør</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>May</source>
         <translation>Maj</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Dec</source>
         <translation>Dec</translation>
     </message>
@@ -7061,13 +7317,13 @@ Er Uemis Zurich tilsluttet korrekt?</translation>
         <translation>Planlægning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
         <source>GF low</source>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>%</source>
         <translation>%</translation>
     </message>
@@ -7077,7 +7333,7 @@ Er Uemis Zurich tilsluttet korrekt?</translation>
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="335"/>
         <source>Drop to first depth</source>
         <translation>Gå til første dybde</translation>
     </message>
@@ -7087,69 +7343,69 @@ Er Uemis Zurich tilsluttet korrekt?</translation>
         <translation>Sidste stop på 6 meter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
         <source>Plan backgas breaks</source>
         <translation>Planlæg gasbreaks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="355"/>
         <source>Gas options</source>
         <translation>Gas muligheder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="376"/>
         <source>Bottom SAC</source>
         <translation>Bund SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="383"/>
         <source>Deco SAC</source>
         <translation>Deco SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="380"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="390"/>
         <source>Bottom pO₂</source>
         <translation>Bund pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="403"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="413"/>
         <source>Deco pO₂</source>
         <translation>Deco pO2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="449"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="462"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="478"/>
         <source>Dive notes</source>
         <translation>Dyk notater</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
         <source>Display runtime</source>
         <translation>Vis runtime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <source>Display segment duration</source>
         <translation>Vis etappe varighed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="531"/>
         <source>Display transitions in deco</source>
         <translation>Vis overgange i deko</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="538"/>
         <source>Verbatim dive plan</source>
         <translation>Trin for trin dykkerplan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="387"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="410"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="397"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -7169,17 +7425,17 @@ Er Uemis Zurich tilsluttet korrekt?</translation>
         <translation>6m til overflade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="499"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>I planen, vis runtime (absolut tid) af stops  </translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="515"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>I planen, vis varighed (relativ tid) af stops  </translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>I planen, vis overgangene og behandl disse implicit</translation>
     </message>
diff --git a/translations/subsurface_de_CH.ts b/translations/subsurface_de_CH.ts
index e1423ec59..b0e42b91e 100644
--- a/translations/subsurface_de_CH.ts
+++ b/translations/subsurface_de_CH.ts
@@ -3,12 +3,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="539"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="522"/>
         <source>Person: </source>
         <translation>Person: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="540"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="523"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Sucht nach Buddies und Divemasters</translation>
     </message>
@@ -16,40 +16,188 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="233"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="230"/>
         <source>No buddies</source>
         <translation>Keine Buddies</translation>
     </message>
 </context>
 <context>
+    <name>ColumnNameProvider</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>GPS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Avg depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="210"/>
+        <location filename="../configuredivecomputer.cpp" line="212"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation>Sicherungsdatei %1 konnte nicht gespeichert werden. Fehlermeldung: %2</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="226"/>
+        <location filename="../configuredivecomputer.cpp" line="228"/>
         <source>Could not open backup file: %1</source>
         <translation>Sicherungsdatei konnte nicht geöffnet werden: %1</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="542"/>
+        <location filename="../configuredivecomputer.cpp" line="552"/>
         <source>Dive computer details read successfully</source>
         <translation>Tauchcomputerdetails erfolgreich gelesen</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="551"/>
+        <location filename="../configuredivecomputer.cpp" line="561"/>
         <source>Setting successfully written to device</source>
         <translation>Einstellungen erfolgreich übertragen</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="560"/>
+        <location filename="../configuredivecomputer.cpp" line="570"/>
         <source>Device firmware successfully updated</source>
         <translation>Geräte-Firmware erfolgreich aktualisiert</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="569"/>
+        <location filename="../configuredivecomputer.cpp" line="579"/>
         <source>Device settings successfully reset</source>
         <translation>Geräte-Einstellungen erfolgreich zurückgesetzt</translation>
     </message>
@@ -847,72 +995,72 @@
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1053"/>
         <source>Backup files (*.xml)</source>
         <translation>Sicherungsdateien (*.xml)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1037"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>Beim Speichern der Datensicherungsdatei ist ein Fehler aufgetreten.
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1040"/>
         <source>Backup succeeded</source>
         <translation>Sicherung abgeschlossen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1041"/>
         <source>Your settings have been saved to: %1</source>
         <translation>Ihre Einstellungen wurden gespeichert nach: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1030"/>
         <source>Backup dive computer settings</source>
         <translation>Tauchcomputereinstellungen sichern</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1036"/>
         <source>XML backup error</source>
         <translation>XML-Sicherungsfehler</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1052"/>
         <source>Restore dive computer settings</source>
         <translation>Tauchcomputereinstellungen wiederherstellen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1056"/>
         <source>XML restore error</source>
         <translation>XML-Wiederherstellungsfehler</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1057"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>Beim Wiederherstellen der Datensicherungsdatei ist ein Fehler aufgetreten.
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1063"/>
         <source>Restore succeeded</source>
         <translation>Wiederherstellung abgeschlossen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1064"/>
         <source>Your settings have been restored successfully.</source>
         <translation>Ihre Einstellungen wurden erfolgreich wiederhergestellt.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1074"/>
         <source>Select firmware file</source>
         <translation>Firmwaredatei auswählen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1075"/>
         <source>All files (*.*)</source>
         <translation>Alle Dateien (*.*)</translation>
     </message>
@@ -970,12 +1118,12 @@
         <translation>Hier klicken entfernt diese Flasche.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="410"/>
         <source>Cylinder cannot be removed</source>
         <translation>Flasche kann nicht entfernt werden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="407"/>
+        <location filename="../qt-ui/models.cpp" line="411"/>
         <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>
@@ -1051,12 +1199,12 @@
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="48"/>
         <source>Remove the selected dive computer?</source>
         <translation>Ausgewählten Tauchcomputer entfernen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="49"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
         <translation>Tauchcomputer wirklich entfernen?</translation>
@@ -1070,22 +1218,22 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Model</source>
         <translation>Modell</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Device ID</source>
         <translation>Gerätekennung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Nickname</source>
         <translation>Gerätename</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Hier klicken entfernt diesen Tauchcomputer.</translation>
     </message>
@@ -1093,117 +1241,145 @@
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="115"/>
         <source>Bailing out to OC</source>
         <translation>Notausstieg mit offenem System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="117"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> Anfang</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> Ende</translation>
     </message>
 </context>
 <context>
+    <name>DiveImportedModel</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="556"/>
+        <source>Date/time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
+        <source>Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>h:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>min</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1242"/>
+        <location filename="../qt-ui/models.cpp" line="1248"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1245"/>
+        <location filename="../qt-ui/models.cpp" line="1251"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1248"/>
+        <location filename="../qt-ui/models.cpp" line="1254"/>
         <source>Rating</source>
         <translation>Bewertung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Depth(%1)</source>
         <translation>Tiefe(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1254"/>
+        <location filename="../qt-ui/models.cpp" line="1260"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1263"/>
         <source>Temp(%1%2)</source>
         <translation>Temp(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>Weight(%1)</source>
         <translation>Gewicht(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1263"/>
+        <location filename="../qt-ui/models.cpp" line="1269"/>
         <source>Suit</source>
         <translation>Anzug</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1266"/>
+        <location filename="../qt-ui/models.cpp" line="1272"/>
         <source>Cyl</source>
         <translation>Flasche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1269"/>
+        <location filename="../qt-ui/models.cpp" line="1275"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1277"/>
+        <location filename="../qt-ui/models.cpp" line="1283"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1280"/>
+        <location filename="../qt-ui/models.cpp" line="1286"/>
         <source>Max CNS</source>
         <translation>Max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1283"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>Location</source>
         <translation>Ort</translation>
     </message>
@@ -1211,87 +1387,87 @@
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="787"/>
+        <location filename="../qt-ui/divelistview.cpp" line="768"/>
         <source>Expand all</source>
         <translation>Alle ausfalten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="788"/>
+        <location filename="../qt-ui/divelistview.cpp" line="769"/>
         <source>Collapse all</source>
         <translation>Alle einfalten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="789"/>
+        <location filename="../qt-ui/divelistview.cpp" line="770"/>
         <source>Collapse others</source>
         <translation>Andere einklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="791"/>
+        <location filename="../qt-ui/divelistview.cpp" line="772"/>
         <source>Remove dive(s) from trip</source>
         <translation>Entferne Tauchgäng(e) aus Reise</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="792"/>
+        <location filename="../qt-ui/divelistview.cpp" line="773"/>
         <source>Create new trip above</source>
         <translation>Neue Reise darüber einfügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="806"/>
+        <location filename="../qt-ui/divelistview.cpp" line="787"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Tauchgäng(e) zur Reise darüber hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="808"/>
+        <location filename="../qt-ui/divelistview.cpp" line="789"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Tauchgäng(e) zur Reise darunter hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="812"/>
+        <location filename="../qt-ui/divelistview.cpp" line="793"/>
         <source>Merge trip with trip above</source>
         <translation>Reise mit der darüber verbinden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="813"/>
+        <location filename="../qt-ui/divelistview.cpp" line="794"/>
         <source>Merge trip with trip below</source>
         <translation>Reise mit der darunter verbinden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="817"/>
+        <location filename="../qt-ui/divelistview.cpp" line="798"/>
         <source>Delete dive(s)</source>
         <translation>Tauchgäng(e) löschen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="819"/>
+        <location filename="../qt-ui/divelistview.cpp" line="800"/>
         <source>Mark dive(s) invalid</source>
         <translation>Tauchgäng(e) als ungültig markieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="823"/>
+        <location filename="../qt-ui/divelistview.cpp" line="804"/>
         <source>Merge selected dives</source>
         <translation>Ausgewählte Tauchgänge zusammenführen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="825"/>
+        <location filename="../qt-ui/divelistview.cpp" line="806"/>
         <source>Renumber dive(s)</source>
         <translation>Tauchgänge neu nummerieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="826"/>
+        <location filename="../qt-ui/divelistview.cpp" line="807"/>
         <source>Shift times</source>
         <translation>Zeiten verschieben</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="827"/>
+        <location filename="../qt-ui/divelistview.cpp" line="808"/>
         <source>Load images</source>
         <translation>Bilder laden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Open image files</source>
         <translation>Öffne Bilddateien</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Bilddateien (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -1476,100 +1652,100 @@
         <translation>Sand</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF Dateien (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="268"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>CSV Dateien (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="68"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Generisches Format, welches zum Datenaustausch in diversen Taucherprogrammen verwendet wird.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Tauchdaten an die divelogs.de-Webseite senden.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>Tauchdaten an die dive-share.appspot.com-Webseite senden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>HTML-Export der Tauchplätze, visualisiert auf einer Weltkarte.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
         <source>Subsurface native XML format.</source>
         <translation>Natives Subsurface XML-Format</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
         <source>Write depths of images to file.</source>
         <translation>Tiefe, in der das Bild aufgenommen wurde, in die Datei schreiben</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export UDDF file as</source>
         <translation>UDDF-Datei exportieren als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="267"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
         <source>Export CSV file as</source>
         <translation>CSV-Datei exportieren als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="278"/>
         <source>Export world map</source>
         <translation>Weltkarte exportieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="299"/>
         <source>HTML files (*.html)</source>
         <translation>HTML Dateien (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="283"/>
         <source>Export Subsurface XML</source>
         <translation>Exportiere Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="284"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML Dateien (*.xml, *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
         <source>Save image depths</source>
         <translation>Tiefe speichern, in der das Bild aufgenommen wurde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="298"/>
         <source>Export HTML files as</source>
         <translation>HTML-Datei exportieren als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
         <source>Can&apos;t open file %s</source>
         <translation>Kann Datei %s nicht öffnen</translation>
     </message>
@@ -1582,248 +1758,228 @@
         <translation>Tauchprotokolldatei importieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
-        <source>CSV options</source>
-        <translation>CSV Optionen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="281"/>
-        <source>Pre-configured imports</source>
-        <translation>Vorkonfigurierte Importe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="122"/>
-        <source>Depth</source>
-        <translation>Tiefe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="142"/>
-        <source>Stopdepth</source>
-        <translation>Stopptiefe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="162"/>
-        <source>Pressure</source>
-        <translation>Druck</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="176"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="466"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
         <source>Time</source>
         <translation>Zeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="183"/>
-        <source>Temp</source>
-        <translation>Temperatur</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="213"/>
-        <source>NDL</source>
-        <translation>Nullzeit</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="233"/>
-        <source>TTS</source>
-        <translation>Gesamtaufstiegszeit</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="253"/>
-        <source>Cns</source>
-        <translation>CNS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="58"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="789"/>
-        <source>Field separator</source>
-        <translation>Feldtrenner</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="35"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="363"/>
-        <source>Units</source>
-        <translation>Einheiten</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="42"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="370"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="97"/>
         <source>Metric</source>
         <translation>Metrisch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="47"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="375"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="102"/>
         <source>Imperial</source>
         <translation>Zöllig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="169"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="298"/>
-        <source>Manual dives</source>
-        <translation>Manuelle Tauchgänge</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="316"/>
-        <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source>
-        <translation>Bitte Reihenfolge von Tag, Monat und Jahr im Datumsformat wählen. Das Trennzeichen kann eines aus .-/ sein.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="319"/>
-        <source>Date format</source>
-        <translation>Datumsformat</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="332"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="59"/>
         <source>dd.mm.yyyy</source>
         <translation>tt.mm.jjjj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="337"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="64"/>
         <source>mm/dd/yyyy</source>
         <translation>mm/tt/jjjj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="342"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="69"/>
         <source>yyyy-mm-dd</source>
         <translation>jjjj-mm-tt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="392"/>
-        <source>Dive #</source>
-        <translation>Tauchgang Nr.</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="426"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="439"/>
-        <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source>
-        <translation>Datum als tt.mm.jjjj, jjjj-mm-tt oder mm/tt/jjjj</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+        <source>Dive #</source>
+        <translation>Tauchgang Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="429"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="500"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="513"/>
-        <source>Dive duration in seconds or in min:sec format</source>
-        <translation>Tauchgangsdauer in Sekunden oder als min:sec</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="503"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="574"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="591"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
         <source>Tags</source>
         <translation>Stichwörter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="608"/>
-        <source>Cyl size</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+        <source>He</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="625"/>
-        <source>Air temp</source>
-        <translation>Lufttemperatur</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="78"/>
+        <source>Seconds</source>
+        <translation>Sekunden</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
+        <source>Minutes</source>
+        <translation>Minuten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="642"/>
-        <source>Start Pressure</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="88"/>
+        <source>Minutes:seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="659"/>
-        <source>Water temp</source>
-        <translation>Wassertemperatur</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+        <source>Location</source>
+        <translation>Ort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="676"/>
-        <source>End Press</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+        <source>Max depth</source>
+        <translation>Max. Tiefe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+        <source>Tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="693"/>
-        <source>O₂</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="710"/>
-        <source>He</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+        <source>Sample time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="742"/>
-        <source>Choose duration format.</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+        <source>Sample depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="745"/>
-        <source>Duration format</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+        <source>Sample temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="758"/>
-        <source>Seconds</source>
-        <translation>Sekunden</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="763"/>
-        <source>Minutes</source>
-        <translation>Minuten</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="768"/>
-        <source>Minutes:seconds</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+        <source>Sample ndl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="540"/>
-        <source>Location</source>
-        <translation>Ort</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="409"/>
-        <source>Max depth</source>
-        <translation>Max. Tiefe</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="386"/>
-        <source>Field configuration</source>
-        <translation>Feldkonfiguration</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+        <source>Samples pressure</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
         <source>Mean depth</source>
         <translation>Mittlere Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="483"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="523"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
         <source>Notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="557"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DivePlanner</name>
@@ -1866,42 +2022,42 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="691"/>
         <source>Final depth</source>
         <translation>Endtiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="693"/>
         <source>Run time</source>
         <translation>Laufzeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="701"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="695"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="703"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
         <source>Used gas</source>
         <translation>Gasverbrauch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="705"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
         <source>CC set point</source>
         <translation>CC Set Point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1044"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1051"/>
         <source>Discard the plan?</source>
         <translation>Diese Planung verwerfen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1045"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1052"/>
         <source>You are about to discard your plan.</source>
         <translation>Du bist dabei Deinen Plan zu verwerfen.</translation>
     </message>
@@ -1909,22 +2065,22 @@
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="257"/>
         <source>Dive planner points</source>
         <translation>Planerpunkte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="261"/>
         <source>Available gases</source>
         <translation>Verfügbare Gase</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="284"/>
         <source>Add dive data point</source>
         <translation>Datenpunkt hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="304"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="293"/>
         <source>Save new</source>
         <translation>Neue speichern</translation>
     </message>
@@ -1932,92 +2088,112 @@
 <context>
     <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
         <source>Time</source>
         <translation>Zeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
         <source>Pressure</source>
         <translation>Druck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
         <source>Color</source>
         <translation>Farbe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
         <source>Pressure S</source>
         <translation>Druck S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
+        <source>Setpoint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
+        <source>Sensor1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
+        <source>Sensor2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
+        <source>Sensor3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
         <source>Ambient pressure</source>
         <translation>Umgebungsdruck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
-        <source>Heart Beat</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
+        <source>Heart beat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
-        <source>Gradient Factor</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/>
+        <source>Gradient factor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
-        <source>Mean Depth/s</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
+        <source>Mean depth/s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
         <source>Pressure I</source>
         <translation>Druck I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
         <source>User entered</source>
         <translation>Benutzer Eingabe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
         <source>Cylinder index</source>
         <translation>Flaschen Index</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
         <source>Ceiling</source>
         <translation>Tiefster Deko-Stopp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
@@ -2068,127 +2244,127 @@
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1437"/>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1443"/>
+        <location filename="../qt-ui/models.cpp" line="1489"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1440"/>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1492"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1443"/>
-        <location filename="../qt-ui/models.cpp" line="1489"/>
+        <location filename="../qt-ui/models.cpp" line="1449"/>
+        <location filename="../qt-ui/models.cpp" line="1495"/>
         <source>Rating</source>
         <translation>Bewertung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1452"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1458"/>
         <source>Temp</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1461"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>Weight(%1)</source>
         <translation>Gewicht(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1458"/>
-        <location filename="../qt-ui/models.cpp" line="1504"/>
+        <location filename="../qt-ui/models.cpp" line="1464"/>
+        <location filename="../qt-ui/models.cpp" line="1510"/>
         <source>Suit</source>
         <translation>Anzug</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1461"/>
-        <location filename="../qt-ui/models.cpp" line="1507"/>
+        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1513"/>
         <source>Cyl</source>
         <translation>Flasche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1464"/>
-        <location filename="../qt-ui/models.cpp" line="1510"/>
+        <location filename="../qt-ui/models.cpp" line="1470"/>
+        <location filename="../qt-ui/models.cpp" line="1516"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1473"/>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1527"/>
         <source>Max CNS</source>
         <translation>Max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
-        <location filename="../qt-ui/models.cpp" line="1524"/>
+        <location filename="../qt-ui/models.cpp" line="1482"/>
+        <location filename="../qt-ui/models.cpp" line="1530"/>
         <source>Location</source>
         <translation>Ort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>Depth(%1)</source>
         <translation>Tiefe(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1449"/>
-        <location filename="../qt-ui/models.cpp" line="1495"/>
+        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1501"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1498"/>
+        <location filename="../qt-ui/models.cpp" line="1504"/>
         <source>Temp(%1%2)</source>
         <translation>Temp(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1470"/>
-        <location filename="../qt-ui/models.cpp" line="1518"/>
+        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1524"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -2196,95 +2372,95 @@
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="98"/>
         <source>no dives were selected</source>
         <translation>keine Tauchgänge ausgewählt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="117"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>konnte keine zip Datei für die Übertragung erstellen: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="143"/>
         <source>cannot create temporary file: %s</source>
         <translation>kann keine temporäre Datei erstellen: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/>
         <source>internal error: %s</source>
         <translation>ein Fehler ist aufgetreten: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="169"/>
         <source>internal error</source>
         <translation>ein interner Fehler ist aufgetreten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="629"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="828"/>
         <source>Done</source>
         <translation>Fertig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/>
         <source>Uploading dive list...</source>
         <translation>Übertrage Liste der Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="692"/>
         <source>Downloading dive list...</source>
         <translation>Liste der Tauchgänge herunterladen...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="741"/>
         <source>Downloading %1 dives...</source>
         <translation>Lade %1 Tauchgänge vom Server...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="785"/>
         <source>Download finished - %1</source>
         <translation>Herunterladen beendet - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="802"/>
         <source>Corrupted download</source>
         <translation>Heruntergeladene Daten sind beschädigt.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Das Archiv konnte nicht geöffnet werden
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
         <source>Upload failed</source>
         <translation>Übertragung fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/>
         <source>Upload successful</source>
         <translation>Übertragung erfolgreich</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
         <source>Login failed</source>
         <translation>Anmeldung fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
         <source>Cannot parse response</source>
         <translation>Verstehe die Antwort nicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
         <source>Error: %1</source>
         <translation>Fehler: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="829"/>
         <source>Upload finished</source>
         <translation>Übertragung beendet</translation>
     </message>
@@ -2292,54 +2468,52 @@
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="169"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="400"/>
         <source>Retry</source>
         <translation>Wiederholen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="264"/>
         <source>Find Uemis dive computer</source>
         <translation>Finde Uemis Tauchcomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Wählen Sie die Datei zum Herunterladen der Tauchcomputer-Protokolldatei aus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Log files (*.log)</source>
         <translation>Protokolldateien (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="362"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="363"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>Wenn der libdivecomputer Dump gespeichert wird, werden keine Tauchgänge zur Liste der Tauchgänge hinzugefügt.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="374"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Datei auswählen, in die der libdivecomputer Dump gespeichert werden soll</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="375"/>
         <source>Dump files (*.bin)</source>
         <translation>Dump Dateien (*.bin)</translation>
     </message>
@@ -2347,7 +2521,7 @@
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="101"/>
         <source>Vendor</source>
         <translation>Hersteller</translation>
     </message>
@@ -2357,54 +2531,74 @@
         <translation>Von Tauchcomputer laden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="31"/>
         <source>Device or mount point</source>
         <translation>Gerät oder Einhängepunkt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="111"/>
         <source>Dive computer</source>
         <translation>Tauchcomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="132"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="45"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="80"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="94"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="52"/>
         <source>Force download of all dives</source>
         <translation>Erneutes Laden aller Tauchgänge erzwingen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
         <source>Always prefer downloaded dives</source>
         <translation>Heruntergeladene Tauchgänge immer bevorzugen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="189"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/>
+        <source>Downloaded Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
+        <source>Select all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
+        <source>Unselect all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
         <source>Save libdivecomputer logfile</source>
         <translation>libdivecomputer-Protokolldatei speichern</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="87"/>
         <source>Save libdivecomputer dumpfile</source>
         <translation>Dump Datei der libdivecomputer Übertragung speichern</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
         <source>Download into new trip</source>
         <translation>Download in neue Reise</translation>
     </message>
@@ -2412,12 +2606,12 @@
 <context>
     <name>ExtraDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Key</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Value</source>
         <translation>Wert</translation>
     </message>
@@ -2431,21 +2625,21 @@
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="245"/>
-        <source>Your dive profile was updated to facebook.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
-        <source>Photo Upload Failed</source>
+        <source>Your dive profile was updated to Facebook.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="250"/>
-        <source>Your dive profile was not updated to facebook, 
+        <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+        <source>Photo Upload Failed</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>FilterWidget</name>
@@ -2486,17 +2680,17 @@
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1544"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1621"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Diese Funktion ist für den ausgewählten Tauchcomputer noch nicht verfügbar.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1624"/>
         <source>Firmware update failed!</source>
         <translation>Firmware-Aktualisierung fehlgeschlagen!</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1550"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1627"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Verbindung zum Tauchcomputer konnte nicht hergestellt werden.</translation>
     </message>
@@ -2504,7 +2698,7 @@
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="128"/>
+        <location filename="../qt-ui/globe.cpp" line="119"/>
         <source>Edit selected dive locations</source>
         <translation>Ausgewählte Tauchplätze bearbeiten</translation>
     </message>
@@ -2512,7 +2706,7 @@
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="566"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="549"/>
         <source>Location: </source>
         <translation>Ort:</translation>
     </message>
@@ -2520,7 +2714,7 @@
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="286"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="283"/>
         <source>No location set</source>
         <translation>Kein Ort festgelegt</translation>
     </message>
@@ -2528,330 +2722,335 @@
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="133"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
+        <location filename="../qt-ui/maintab.cpp" line="497"/>
         <source>Location</source>
         <translation>Ort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="67"/>
         <source>Coordinates</source>
         <translation>Koordinaten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="169"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="154"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="222"/>
+        <location filename="../qt-ui/maintab.ui" line="277"/>
         <source>Tags</source>
         <translation>Stichwörter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="186"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
         <source>Rating</source>
         <translation>Bewertung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="221"/>
         <source>Visibility</source>
         <translation>Sicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="230"/>
         <source>Suit</source>
         <translation>Anzug</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="465"/>
+        <location filename="../qt-ui/maintab.cpp" line="470"/>
         <source>Dive notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
-        <location filename="../qt-ui/maintab.ui" line="648"/>
-        <location filename="../qt-ui/maintab.cpp" line="277"/>
+        <location filename="../qt-ui/maintab.ui" line="74"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="102"/>
+        <location filename="../qt-ui/maintab.ui" line="677"/>
+        <location filename="../qt-ui/maintab.cpp" line="279"/>
         <source>Air temp.</source>
         <translation>Lufttemp.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <location filename="../qt-ui/maintab.ui" line="667"/>
-        <location filename="../qt-ui/maintab.cpp" line="278"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.ui" line="696"/>
+        <location filename="../qt-ui/maintab.cpp" line="280"/>
         <source>Water temp.</source>
         <translation>Wassertemp.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="229"/>
-        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.ui" line="284"/>
+        <location filename="../qt-ui/maintab.cpp" line="498"/>
         <source>Notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="369"/>
+        <location filename="../qt-ui/maintab.ui" line="398"/>
         <source>Equipment</source>
         <translation>Ausrüstung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="496"/>
+        <location filename="../qt-ui/maintab.ui" line="525"/>
         <source>Gases used</source>
         <translation>Verw. Gase</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="515"/>
+        <location filename="../qt-ui/maintab.ui" line="544"/>
         <source>Gas consumed</source>
         <translation>Gasverbrauch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="553"/>
+        <location filename="../qt-ui/maintab.ui" line="582"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="591"/>
+        <location filename="../qt-ui/maintab.ui" line="620"/>
         <source>Max. depth</source>
         <translation>Max. Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="629"/>
+        <location filename="../qt-ui/maintab.ui" line="658"/>
         <source>Air pressure</source>
         <translation>Luftdruck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="686"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>Dive time</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="845"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
         <source>Total time</source>
         <translation>Gesamtzeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="903"/>
+        <location filename="../qt-ui/maintab.ui" line="932"/>
         <source>Gas consumption</source>
         <translation>Gasverbrauch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="962"/>
+        <location filename="../qt-ui/maintab.ui" line="991"/>
         <source>Extra data</source>
         <translation>Zusatzdaten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="968"/>
+        <location filename="../qt-ui/maintab.ui" line="997"/>
         <source>Additional data from dive computer</source>
         <translation>Zusätzliche Daten vom Tauchcomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="54"/>
-        <location filename="../qt-ui/maintab.ui" line="458"/>
+        <location filename="../qt-ui/maintab.ui" line="83"/>
+        <location filename="../qt-ui/maintab.ui" line="487"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="61"/>
+        <location filename="../qt-ui/maintab.ui" line="90"/>
         <source>Time</source>
         <translation>Zeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="425"/>
+        <location filename="../qt-ui/maintab.ui" line="454"/>
         <source>Dive info</source>
         <translation>Informationen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="477"/>
+        <location filename="../qt-ui/maintab.ui" line="506"/>
         <source>Interval</source>
         <translation>Oberflächenpause</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="534"/>
-        <location filename="../qt-ui/maintab.ui" line="799"/>
+        <location filename="../qt-ui/maintab.ui" line="563"/>
+        <location filename="../qt-ui/maintab.ui" line="828"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="610"/>
+        <location filename="../qt-ui/maintab.ui" line="639"/>
         <source>Avg. depth</source>
         <translation>Ø Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="572"/>
+        <location filename="../qt-ui/maintab.ui" line="601"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="734"/>
         <source>Salinity</source>
         <translation>Salzgehalt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="742"/>
+        <location filename="../qt-ui/maintab.ui" line="771"/>
         <source>Stats</source>
         <translation>Statistiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="775"/>
+        <location filename="../qt-ui/maintab.ui" line="804"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="787"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="813"/>
+        <location filename="../qt-ui/maintab.ui" line="842"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="864"/>
+        <location filename="../qt-ui/maintab.ui" line="893"/>
         <source>Dives</source>
         <translation>Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="948"/>
+        <location filename="../qt-ui/maintab.ui" line="977"/>
         <source>Photos</source>
         <translation>Bilder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="95"/>
+        <location filename="../qt-ui/maintab.cpp" line="87"/>
         <source>Cylinders</source>
         <translation>Flaschen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="99"/>
+        <location filename="../qt-ui/maintab.cpp" line="91"/>
         <source>Weights</source>
         <translation>Blei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="55"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Apply changes</source>
         <translation>Änderungen anwenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="59"/>
+        <location filename="../qt-ui/maintab.cpp" line="50"/>
         <source>Discard changes</source>
         <translation>Änderungen Verwerfen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="96"/>
+        <location filename="../qt-ui/maintab.cpp" line="88"/>
         <source>Add cylinder</source>
         <translation>Flasche hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="100"/>
+        <location filename="../qt-ui/maintab.cpp" line="92"/>
         <source>Add weight system</source>
         <translation>Gewicht hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="274"/>
+        <location filename="../qt-ui/maintab.cpp" line="276"/>
         <source>Air temp. [%1]</source>
         <translation>Lufttemp. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="275"/>
+        <location filename="../qt-ui/maintab.cpp" line="277"/>
         <source>Water temp. [%1]</source>
         <translation>Wassertemp. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="312"/>
+        <location filename="../qt-ui/maintab.cpp" line="314"/>
         <source>This trip is being edited.</source>
         <translation>Diese Reise wird bearbeitet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="320"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Multiple dives are being edited.</source>
         <translation>Mehrere Tauchgänge werden bearbeitet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.cpp" line="324"/>
         <source>This dive is being edited.</source>
         <translation>Dieser Tauchgang wird bearbeitet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="436"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
+        <location filename="../qt-ui/maintab.cpp" line="465"/>
         <source>Trip notes</source>
         <translation>Reisenotizen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="458"/>
+        <location filename="../qt-ui/maintab.cpp" line="463"/>
         <source>Trip location</source>
         <translation>Reiseort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="526"/>
-        <location filename="../qt-ui/maintab.cpp" line="558"/>
-        <location filename="../qt-ui/maintab.cpp" line="562"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
         <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="574"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="555"/>
+        <location filename="../qt-ui/maintab.cpp" line="563"/>
         <source>Deepest dive</source>
         <translation>Tiefster Tauchgang</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="556"/>
+        <location filename="../qt-ui/maintab.cpp" line="564"/>
         <source>Shallowest dive</source>
         <translation>Flachster Tauchgang</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="569"/>
+        <location filename="../qt-ui/maintab.cpp" line="577"/>
         <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="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="578"/>
         <source>Lowest total SAC of a dive</source>
         <translation>Niedrigster gesamt SAC eines Tauchganges</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="571"/>
+        <location filename="../qt-ui/maintab.cpp" line="579"/>
         <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="582"/>
+        <location filename="../qt-ui/maintab.cpp" line="590"/>
         <source>Highest temperature</source>
         <translation>Höchste Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="583"/>
+        <location filename="../qt-ui/maintab.cpp" line="591"/>
         <source>Lowest temperature</source>
         <translation>Niedrigste Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="584"/>
+        <location filename="../qt-ui/maintab.cpp" line="592"/>
         <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="594"/>
+        <location filename="../qt-ui/maintab.cpp" line="602"/>
         <source>Longest dive</source>
         <translation>Längster Tauchgang</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="595"/>
+        <location filename="../qt-ui/maintab.cpp" line="603"/>
         <source>Shortest dive</source>
         <translation>Kürzester Tauchgang</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="596"/>
+        <location filename="../qt-ui/maintab.cpp" line="604"/>
         <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="620"/>
+        <location filename="../qt-ui/maintab.cpp" line="628"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -2860,17 +3059,17 @@ den folgenden Gasen gemischt werden:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="624"/>
+        <location filename="../qt-ui/maintab.cpp" line="632"/>
         <source> and </source>
         <translation>und</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="911"/>
+        <location filename="../qt-ui/maintab.cpp" line="925"/>
         <source>Discard the changes?</source>
         <translation>Änderungen verwerfen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="912"/>
+        <location filename="../qt-ui/maintab.cpp" line="926"/>
         <source>You are about to discard your changes.</source>
         <translation>Sie sind im Begriff, die Änderungen zu Verwerfen.</translation>
     </message>
@@ -3017,7 +3216,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="296"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="232"/>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
@@ -3377,90 +3576,90 @@ p, li { white-space: pre-wrap; }
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="252"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="229"/>
         <source>Open file</source>
         <translation>Datei öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="256"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="233"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="332"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="309"/>
         <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="444"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
         <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="491"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
         <source>Print runtime table</source>
         <translation>Laufzeittabelle anzeigen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="834"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="811"/>
         <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="836"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="813"/>
         <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="841"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="818"/>
         <source>Save changes?</source>
         <translation>Änderungen speichern?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1196"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1173"/>
         <source>Save file as</source>
         <translation>Datei speichern unter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1337"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1314"/>
         <source>Open dive log file</source>
         <translation>Tauchprotokolldatei öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="819"/>
         <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="300"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="444"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="277"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1180"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1157"/>
         <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="625"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="602"/>
         <source>Yearly statistics</source>
         <translation>Jahresstatistiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1197"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1174"/>
         <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="1338"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1315"/>
         <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <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>
@@ -3468,7 +3667,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="651"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="634"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Filter zeigt %1 (von %2) Tauchgängen</translation>
     </message>
@@ -3476,39 +3675,39 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="239"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="243"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="244"/>
         <source>Not now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="245"/>
         <source>Update firmware</source>
         <translation>Firmware aktualisieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
         <source>Firmware upgrade notice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
         <source>Save the downloaded firmware as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
         <source>HEX files (*.hex)</source>
         <translation type="unfinished"/>
     </message>
@@ -3516,54 +3715,69 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Open circuit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="481"/>
         <source>Last stop at 20ft</source>
         <translation>Letzter Stopp auf 20 Fuss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="482"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% mitlerer Tiefe bis 20ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="489"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
         <source>20ft to surface</source>
         <translation>20ft bis Oberfläche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="485"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
         <source>Last stop at 6m</source>
         <translation>Letzter Stopp auf 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% mitlerer Tiefe bis 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="494"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
         <source>6m to surface</source>
         <translation>6m bis Oberfläche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="497"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="498"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
         <source>cuft/min</source>
         <translation>cuft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="506"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="507"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="500"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="501"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
@@ -3682,6 +3896,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="816"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -3716,57 +3931,87 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="795"/>
+        <source>CCR: Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="809"/>
+        <source>Default CCR set-point for dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="832"/>
+        <source>pSCR O₂ metabolism rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="839"/>
+        <source>pSCR ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="846"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="859"/>
+        <source>1:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="875"/>
         <source>System default</source>
         <translation>Standardeinstellungen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="843"/>
+        <location filename="../qt-ui/preferences.ui" line="914"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="849"/>
+        <location filename="../qt-ui/preferences.ui" line="920"/>
         <source>Proxy type</source>
         <translation>Proxy-Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="862"/>
+        <location filename="../qt-ui/preferences.ui" line="933"/>
         <source>Host</source>
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="888"/>
+        <location filename="../qt-ui/preferences.ui" line="959"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="914"/>
+        <location filename="../qt-ui/preferences.ui" line="985"/>
         <source>Requires authentication</source>
         <translation>Anmeldung erforderlich</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="934"/>
+        <location filename="../qt-ui/preferences.ui" line="1005"/>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="957"/>
+        <location filename="../qt-ui/preferences.ui" line="1028"/>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="985"/>
-        <source>about:blank</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="1011"/>
-        <source>Disconnect from facebook</source>
+        <location filename="../qt-ui/preferences.ui" line="1079"/>
+        <source>Disconnect from Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="824"/>
+        <location filename="../qt-ui/preferences.ui" line="895"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
@@ -3921,52 +4166,52 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>GF hoch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="28"/>
+        <location filename="../qt-ui/preferences.cpp" line="44"/>
         <source>No proxy</source>
         <translation>Kein Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="29"/>
+        <location filename="../qt-ui/preferences.cpp" line="45"/>
         <source>System proxy</source>
         <translation>Systemproxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="30"/>
+        <location filename="../qt-ui/preferences.cpp" line="46"/>
         <source>HTTP proxy</source>
         <translation>HTTP Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="31"/>
+        <location filename="../qt-ui/preferences.cpp" line="47"/>
         <source>SOCKS proxy</source>
         <translation>SOCKS Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="291"/>
+        <location filename="../qt-ui/preferences.cpp" line="324"/>
         <source>Restart required</source>
         <translation>Bitte Programm neu starten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="292"/>
+        <location filename="../qt-ui/preferences.cpp" line="325"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>Um die neue Sprache laden zu können, muss Subsurface neu gestartet werden.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="456"/>
+        <location filename="../qt-ui/preferences.cpp" line="494"/>
         <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
         <translation>Mit OK werden alle Einstellungen zurückgesetzt. Dies hat sofortige Wirkung.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Open default log file</source>
         <translation>Standard-Protokolldatei öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="455"/>
+        <location filename="../qt-ui/preferences.cpp" line="493"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
@@ -3974,17 +4219,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="91"/>
+        <location filename="../qt-ui/printdialog.cpp" line="85"/>
         <source>&amp;Preview</source>
         <translation>Vorschau</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="88"/>
+        <location filename="../qt-ui/printdialog.cpp" line="82"/>
         <source>P&amp;rint</source>
         <translation>Drucken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="103"/>
+        <location filename="../qt-ui/printdialog.cpp" line="97"/>
         <source>Print</source>
         <translation>Drucken</translation>
     </message>
@@ -3992,42 +4237,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="20"/>
         <source>Dive#</source>
         <translation>Tauchgang Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="21"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="22"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="23"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Master</source>
         <translation>Guide</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="34"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Location</source>
         <translation>Ort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <location filename="../qt-ui/printlayout.cpp" line="63"/>
         <source>Subsurface cannot find a usable printer on this system!</source>
         <translation>Subsurface konnte keine nutzbaren Drucker finden.</translation>
     </message>
@@ -4093,72 +4338,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2095"/>
+        <location filename="../qt-ui/models.cpp" line="2101"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2100"/>
+        <location filename="../qt-ui/models.cpp" line="2106"/>
         <source>Dive #%1 - %2</source>
         <translation>Tauchgang Nr. %1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2103"/>
+        <location filename="../qt-ui/models.cpp" line="2109"/>
         <source>Max depth: %1 %2</source>
         <translation>max Tiefe: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2110"/>
+        <location filename="../qt-ui/models.cpp" line="2116"/>
         <source>Duration: %1 min</source>
         <translation>Dauer: %1 Minuten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2115"/>
+        <location filename="../qt-ui/models.cpp" line="2121"/>
         <source>Gas used:</source>
         <translation>Verw. Gas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2117"/>
+        <location filename="../qt-ui/models.cpp" line="2123"/>
         <source>Tags:</source>
         <translation>Stichwörter:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2119"/>
+        <location filename="../qt-ui/models.cpp" line="2125"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2121"/>
+        <location filename="../qt-ui/models.cpp" line="2127"/>
         <source>Weights:</source>
         <translation>Blei:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2126"/>
+        <location filename="../qt-ui/models.cpp" line="2132"/>
         <source>Notes:</source>
         <translation>Notizen:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2133"/>
+        <location filename="../qt-ui/models.cpp" line="2139"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2135"/>
+        <location filename="../qt-ui/models.cpp" line="2141"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2137"/>
+        <location filename="../qt-ui/models.cpp" line="2143"/>
         <source>Suit:</source>
         <translation>Anzug:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2139"/>
+        <location filename="../qt-ui/models.cpp" line="2145"/>
         <source>Viz:</source>
         <translation>Sicht:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2141"/>
+        <location filename="../qt-ui/models.cpp" line="2147"/>
         <source>Rating:</source>
         <translation>Bewertung:</translation>
     </message>
@@ -4166,103 +4411,108 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="628"/>
         <source> (#%1 of %2)</source>
         <translation> (#%1 von %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="630"/>
+        <source>Unknown dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="647"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>Null-/Auftauchzeitberechnung wegen Zeitüberschreitung abgebrochen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1168"/>
         <source>Make first divecomputer</source>
         <translation>Primärer Tauchcomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Delete this divecomputer</source>
         <translation>Lösche diesen Tauchcomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1184"/>
         <source>Add gas change</source>
         <translation>Gaswechsel setzen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1187"/>
         <source> (Tank %1)</source>
         <translation> (Tank %1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1195"/>
         <source>Add set-point change</source>
         <translation>Set-Point-Wechsel hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1197"/>
         <source>Add bookmark</source>
         <translation>Markierung setzen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
         <source>Remove event</source>
         <translation>Entferne Ereignis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1206"/>
         <source>Hide similar events</source>
         <translation>Ähnliche Ereignisse ausblenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1213"/>
         <source>Edit name</source>
         <translation>Name bearbeiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1242"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1249"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>Druck in Flasche %1 (momentan zu %2 interpoliert)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1264"/>
         <source>Unhide all events</source>
         <translation>Alle Ereignisse einblenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide events</source>
         <translation>Ereignisse ausblenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide all %1 events?</source>
         <translation>Alle %1 Ereignisse ausblenden?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1333"/>
         <source>Remove the selected event?</source>
         <translation>Ausgewähltes Ereignis entfernen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1334"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1424"/>
         <source>Edit name of bookmark</source>
         <translation>Name der Markierung bearbeiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
         <source>Custom name:</source>
         <translation>Benutzerdefinierter Name:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1430"/>
         <source>Name is too long!</source>
         <translation>Der Name ist zu lang!</translation>
     </message>
@@ -4270,102 +4520,102 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>AIR</source>
         <translation>Luft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>OXYGEN</source>
         <translation>SAUERSTOFF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="208"/>
         <source>Remove this point</source>
         <translation>Diesen Punkt entfernen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="57"/>
         <source>Close</source>
         <translation>Schliessen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="42"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="25"/>
         <source>Average</source>
         <translation>Ø</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="45"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="28"/>
         <source>Minimum</source>
         <translation>Min.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="48"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="31"/>
         <source>Maximum</source>
         <translation>Max.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="297"/>
+        <location filename="../qt-ui/globe.cpp" line="296"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>Karte verschieben und mit Doppelklick Tauchplatz markieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="525"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="526"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="550"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="551"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="570"/>
+        <location filename="../qt-ui/models.cpp" line="574"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="571"/>
+        <location filename="../qt-ui/models.cpp" line="575"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="595"/>
+        <location filename="../qt-ui/models.cpp" line="599"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="596"/>
+        <location filename="../qt-ui/models.cpp" line="600"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="513"/>
         <source>Invalid response from server</source>
         <translation>Ungültige Serverantwort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation>%1 anstelle des erwarteten XML Tags &apos;DiveDateReader&apos;.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="567"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation>XML Tag &apos;DiveDates&apos; nicht gefunden.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Ungültige XML Antwort. Zeile %1: %2</translation>
     </message>
@@ -4373,12 +4623,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1450"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1518"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Diese Funktion ist für den ausgewählten Tauchcomputer noch nicht verfügbar.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1442"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Verbindung zum Tauchcomputer konnte nicht hergestellt werden.</translation>
     </message>
@@ -4392,12 +4642,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
-        <location filename="../qt-ui/simplewidgets.cpp" line="151"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="134"/>
         <source>New starting number</source>
         <translation>Neue erste Nummer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="149"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="132"/>
         <source>New number</source>
         <translation>Neue Nummer</translation>
     </message>
@@ -4405,12 +4655,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1575"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1653"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Diese Funktion ist für den ausgewählten Tauchcomputer noch nicht verfügbar.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1579"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1657"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Verbindung zum Tauchcomputer konnte nicht hergestellt werden.</translation>
     </message>
@@ -4489,12 +4739,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Welche/s Datum/Zeit werden im Bild angezeigt?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="276"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="259"/>
         <source>Open image file</source>
         <translation>Öffne Bilddatei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="278"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="261"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Bilddateien (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -4547,7 +4797,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <name>SocialNetworkDialog</name>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="282"/>
-        <source>Dive Date: %1 
+        <source>Dive date: %1 
 </source>
         <translation type="unfinished"/>
     </message>
@@ -4571,7 +4821,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="290"/>
-        <source>Dive Location: %1 
+        <source>Dive location: %1 
 </source>
         <translation type="unfinished"/>
     </message>
@@ -4688,47 +4938,47 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="329"/>
         <source>Webservice</source>
         <translation>Webdienst</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="393"/>
         <source>Connecting...</source>
         <translation>Verbinde...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
         <source>Download finished</source>
         <translation>Herunterladen beendet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Download error: %1</source>
         <translation>Fehler beim Herunterladen: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="436"/>
         <source>Connection error: </source>
         <translation>Verbindungsfehler: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
         <source>Download successful</source>
         <translation>Erfolgreich geladen!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="439"/>
         <source>Invalid user identifier!</source>
         <translation>Ungültige Benutzerkennung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="312"/>
         <source>Enter User ID and click Download</source>
         <translation>Benutzerkennung eingeben und Herunterladen klicken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="442"/>
         <source>Cannot parse response!</source>
         <translation>Verstehe die Antwort nicht!</translation>
     </message>
@@ -4736,7 +4986,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="592"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="575"/>
         <source>Suits: </source>
         <translation>Anzug:</translation>
     </message>
@@ -4744,7 +4994,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="119"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="116"/>
         <source>No suit set</source>
         <translation>Kein Anzug eingetragen</translation>
     </message>
@@ -4761,7 +5011,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="513"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="496"/>
         <source>Tags: </source>
         <translation>Stichwörter: </translation>
     </message>
@@ -4769,7 +5019,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="144"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="141"/>
         <source>Empty tags</source>
         <translation>Leere Tags</translation>
     </message>
@@ -4777,17 +5027,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -4795,7 +5045,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="141"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="131"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
@@ -4803,7 +5053,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1090"/>
+        <location filename="../qt-ui/models.cpp" line="1094"/>
         <source> (%1 shown)</source>
         <translation> (%1 angezeigt)</translation>
     </message>
@@ -4811,72 +5061,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="64"/>
         <source>Check for updates.</source>
         <translation>Neue Version suchen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="66"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface konnte nicht nach neuen Versionen suchen.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="70"/>
         <source>The following error occurred:</source>
         <translation>Fehlermeldung erhalten:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="72"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
         <source>Please check your internet connection.</source>
         <translation>Bitte Überprüfen Sie Ihre Internetverbindung.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="85"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="84"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>Dies ist die neuste Subsurfaceversion.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="88"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>Es gibt eine neue Subsurface-Version.&lt;br/&gt;Klick hier:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; zum Download.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="95"/>
         <source>A new version of Subsurface is available.</source>
         <translation>Es gibt eine neue Version von Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="97"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
         <source>Latest version is %1, please check with your OS vendor for updates.</source>
         <translation>Die aktuellste Version ist %1, bitte den Betriebssystem Hersteller kontaktieren.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="103"/>
         <source>Newest release version is </source>
         <translation>Die letzte freigegebene Version ist </translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="105"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
         <source>The server returned the following information:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="121"/>
         <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
         <source>Decline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="124"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
         <source>Accept</source>
         <translation>Übernehmen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="126"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="125"/>
         <source>Automatic check for updates</source>
         <translation type="unfinished"/>
     </message>
@@ -4884,13 +5134,13 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UserManual</name>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="55"/>
+        <location filename="../qt-ui/usermanual.cpp" line="54"/>
         <source>User Manual</source>
         <translation>Benutzerhandbuch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="72"/>
-        <location filename="../qt-ui/usermanual.cpp" line="78"/>
+        <location filename="../qt-ui/usermanual.cpp" line="71"/>
+        <location filename="../qt-ui/usermanual.cpp" line="77"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Das Subsurface-Handbuch kann nicht gefunden werden</translation>
     </message>
@@ -4968,85 +5218,85 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
         <source>
 Operating System: %1</source>
         <translation>
 Betriebssystem: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 Prozessor Architektur: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 Language: %1</source>
         <translation>
 Sprache: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="93"/>
         <source>Should we ask you later?</source>
         <translation>Sollen wir später noch einmal fragen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Don&apos;t ask me again</source>
         <translation>Fragt mich nicht mehr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Ask later</source>
         <translation>Später nochmal fragen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
         <source>Submit user survey.</source>
         <translation>Unfrageergebnis übertragen.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask again?</source>
         <translation>Fragt noch einmal?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="17"/>
         <source>Send</source>
         <translation>Senden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>
 Prozessor Architektur (laut Betriebsystem): %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation>Subsurface konnte die Benutzerumfrage nicht übertragen.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="121"/>
         <source>The following error occurred:</source>
         <translation>Fehlermeldung erhalten:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>Please check your internet connection.</source>
         <translation>Bitte Überprüfen Sie Ihre Internetverbindung.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="131"/>
         <source>Survey successfully submitted.</source>
         <translation>Benutzerumfrage erfolgreich übertragen.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="136"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation>Während der Suche nach einer neuen Version ist ein Fehler aufgetreten.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -5054,12 +5304,12 @@ Prozessor Architektur (laut Betriebsystem): %1</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -5107,12 +5357,12 @@ Prozessor Architektur (laut Betriebsystem): %1</translation>
         <translation>Hochladen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="247"/>
         <source>Operation timed out</source>
         <translation>Die Aktion hat zu lange gedauert</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="268"/>
         <source>Transferring data...</source>
         <translation>Daten werden übertragen...</translation>
     </message>
@@ -5120,17 +5370,17 @@ Prozessor Architektur (laut Betriebsystem): %1</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="496"/>
+        <location filename="../qt-ui/models.cpp" line="500"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Hier klicken entfernt dieses Gewichtssystem.</translation>
     </message>
@@ -5138,19 +5388,19 @@ Prozessor Architektur (laut Betriebsystem): %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1479"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1487"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1497"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1555"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1566"/>
         <source>Failed!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1506"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1576"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Diese Funktion ist für den ausgewählten Tauchcomputer noch nicht verfügbar.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1580"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Verbindung zum Tauchcomputer konnte nicht hergestellt werden.</translation>
     </message>
@@ -5158,79 +5408,79 @@ Prozessor Architektur (laut Betriebsystem): %1</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1841"/>
+        <location filename="../qt-ui/models.cpp" line="1847"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Jahr 
  &gt; Monat / Reise</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1844"/>
+        <location filename="../qt-ui/models.cpp" line="1850"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1847"/>
+        <location filename="../qt-ui/models.cpp" line="1853"/>
         <source>Duration 
  Total</source>
         <translation>Dauer
 Gesamt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1850"/>
+        <location filename="../qt-ui/models.cpp" line="1856"/>
         <source>
 Average</source>
         <translation>
 Ø</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1853"/>
+        <location filename="../qt-ui/models.cpp" line="1859"/>
         <source>
 Shortest</source>
         <translation>
 Kürzester</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1856"/>
+        <location filename="../qt-ui/models.cpp" line="1862"/>
         <source>
 Longest</source>
         <translation>
 Längster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1859"/>
+        <location filename="../qt-ui/models.cpp" line="1865"/>
         <source>Depth (%1)
  Average</source>
         <translation>Tiefe (%1)
  Durchschnitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1862"/>
-        <location filename="../qt-ui/models.cpp" line="1871"/>
-        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>
 Minimum</source>
         <translation>
 Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1865"/>
-        <location filename="../qt-ui/models.cpp" line="1874"/>
-        <location filename="../qt-ui/models.cpp" line="1883"/>
+        <location filename="../qt-ui/models.cpp" line="1871"/>
+        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>
 Maximum</source>
         <translation>
 Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1874"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
  Durchschnitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1883"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -5311,40 +5561,40 @@ Durchschnitt</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1508"/>
+        <location filename="../dive.c" line="1530"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) oder (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="464"/>
+        <location filename="../divelist.c" line="467"/>
         <location filename="../equipment.c" line="81"/>
-        <location filename="../planner.c" line="1060"/>
-        <location filename="../planner.c" line="1063"/>
+        <location filename="../planner.c" line="1081"/>
+        <location filename="../planner.c" line="1084"/>
         <source>air</source>
         <translation>Luft</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="192"/>
+        <location filename="../equipment.c" line="194"/>
         <source>integrated</source>
         <translation>integriert</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="193"/>
+        <location filename="../equipment.c" line="195"/>
         <source>belt</source>
         <translation>Gürtel</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="194"/>
+        <location filename="../equipment.c" line="196"/>
         <source>ankle</source>
         <translation>Fussblei</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="195"/>
+        <location filename="../equipment.c" line="197"/>
         <source>backplate weight</source>
         <translation>Backplate-Gewicht</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="196"/>
+        <location filename="../equipment.c" line="198"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -5352,7 +5602,7 @@ Durchschnitt</translation>
         <location filename="../file.c" line="112"/>
         <location filename="../file.c" line="434"/>
         <location filename="../file.c" line="506"/>
-        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="925"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Fehler beim Lesen von &apos;%s&apos;</translation>
     </message>
@@ -5409,9 +5659,9 @@ Durchschnitt</translation>
         <translation>Kein zugehöriger Tauchcomputer für die Datei &apos;%s&apos; gefunden</translation>
     </message>
     <message>
-        <location filename="../file.c" line="869"/>
-        <location filename="../file.c" line="909"/>
-        <location filename="../file.c" line="1007"/>
+        <location filename="../file.c" line="870"/>
+        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="1016"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>Maximale Anzahl der unterstützten Spalten beim CSV-Import sind %d</translation>
     </message>
@@ -5582,27 +5832,27 @@ Durchschnitt</translation>
         <translation>ungültige Ereignisnummer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="421"/>
+        <location filename="../libdivecomputer.c" line="419"/>
         <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="427"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Error registering the data</source>
         <translation>Fehler beim Registrieren der Daten</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="433"/>
         <source>Error parsing the datetime</source>
         <translation>Fehler beim Lesen des Datums</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Dive %d: %s</source>
         <translation>Tauchgang %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="455"/>
+        <location filename="../libdivecomputer.c" line="454"/>
         <source>Error parsing the divetime</source>
         <translation>Fehler beim Lesen der Dauer</translation>
     </message>
@@ -5612,156 +5862,156 @@ Durchschnitt</translation>
         <translation>Fehler beim Lesen der maximalen Tiefe</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="482"/>
+        <location filename="../libdivecomputer.c" line="483"/>
         <source>Error parsing temperature</source>
         <translation>Fehler beim Lesen der Temperatur</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="501"/>
+        <location filename="../libdivecomputer.c" line="503"/>
         <source>Error parsing the gas mix count</source>
         <translation>Fehler beim Lesen der Gasgemischszahl</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="513"/>
+        <location filename="../libdivecomputer.c" line="515"/>
         <source>Error obtaining water salinity</source>
         <translation>Fehler beim Lesen des Salzgehalts</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="521"/>
+        <location filename="../libdivecomputer.c" line="524"/>
         <source>Error obtaining surface pressure</source>
         <translation>Kein Oberflächendruck erhalten</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="545"/>
+        <location filename="../libdivecomputer.c" line="549"/>
         <source>Error obtaining divemode</source>
         <translation>Fehler beim Auslesen des Modus des Tauchcomputers</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="562"/>
+        <location filename="../libdivecomputer.c" line="569"/>
         <source>Error parsing the gas mix</source>
         <translation>Fehler beim Lesen des Gasgemischs</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="569"/>
+        <location filename="../libdivecomputer.c" line="576"/>
         <source>Error parsing the samples</source>
         <translation>Fehler beim Lesen der Samples</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="706"/>
+        <location filename="../libdivecomputer.c" line="713"/>
         <source>Event: waiting for user action</source>
         <translation>Ereignis: warte auf Benutzeraktion</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="714"/>
+        <location filename="../libdivecomputer.c" line="721"/>
         <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="778"/>
+        <location filename="../libdivecomputer.c" line="785"/>
         <source>Error registering the event handler.</source>
         <translation>Fehler beim Registrieren der Ereignisbehandlung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="783"/>
+        <location filename="../libdivecomputer.c" line="790"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Fehler bei der Registrierung der Abbruchbehandlung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="804"/>
+        <location filename="../libdivecomputer.c" line="811"/>
         <source>Dive data import error</source>
         <translation>Fehler beim Importieren der Tauchgangsdaten</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="843"/>
+        <location filename="../libdivecomputer.c" line="850"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Fehler beim Erzeugen des libdivecomputer Contexts</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="850"/>
+        <location filename="../libdivecomputer.c" line="857"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Fehler beim Öffnen von %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="858"/>
+        <location filename="../libdivecomputer.c" line="865"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Unzureichende Privilegien zum Öffnen von Gerät %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="506"/>
+        <location filename="../parse-xml.c" line="516"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Unverständliche Prozentangabe %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1760"/>
+        <location filename="../parse-xml.c" line="1770"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Fehler beim Lesen von &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1989"/>
-        <location filename="../parse-xml.c" line="2137"/>
+        <location filename="../parse-xml.c" line="1999"/>
+        <location filename="../parse-xml.c" line="2147"/>
         <source>Database query dm4_events failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1996"/>
-        <location filename="../parse-xml.c" line="2144"/>
+        <location filename="../parse-xml.c" line="2006"/>
+        <location filename="../parse-xml.c" line="2154"/>
         <source>Database query dm4_tags failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2318"/>
+        <location filename="../parse-xml.c" line="2328"/>
         <source>Database query shearwater_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2325"/>
+        <location filename="../parse-xml.c" line="2335"/>
         <source>Database query shearwater_changes failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2332"/>
+        <location filename="../parse-xml.c" line="2342"/>
         <source>Database query shearwater_profile_sample failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2451"/>
+        <location filename="../parse-xml.c" line="2461"/>
         <source>Database query cobalt_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2458"/>
+        <location filename="../parse-xml.c" line="2468"/>
         <source>Database query cobalt_buddies failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2465"/>
+        <location filename="../parse-xml.c" line="2475"/>
         <source>Database query cobalt_visibility failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2472"/>
+        <location filename="../parse-xml.c" line="2482"/>
         <source>Database query cobalt_location failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2479"/>
+        <location filename="../parse-xml.c" line="2489"/>
         <source>Database query cobalt_location (site) failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2486"/>
+        <location filename="../parse-xml.c" line="2496"/>
         <source>Database query cobalt_profile_sample failed.
 </source>
         <translation type="unfinished"/>
@@ -5774,17 +6024,17 @@ Durchschnitt</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2168"/>
-        <location filename="../parse-xml.c" line="2189"/>
-        <location filename="../parse-xml.c" line="2508"/>
-        <location filename="../parse-xml.c" line="2527"/>
+        <location filename="../parse-xml.c" line="2178"/>
+        <location filename="../parse-xml.c" line="2199"/>
+        <location filename="../parse-xml.c" line="2518"/>
+        <location filename="../parse-xml.c" line="2537"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Datenbank Anfrage fehlgeschlagen &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2848"/>
+        <location filename="../parse-xml.c" line="2909"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Kann Stylesheet %s nicht öffnen</translation>
     </message>
@@ -5794,161 +6044,167 @@ Durchschnitt</translation>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="820"/>
+        <location filename="../planner.c" line="841"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Kann Gas %s nicht finden</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="356"/>
+        <location filename="../planner.c" line="363"/>
         <source>Too many gas mixes</source>
         <translation>Zu viele Gasgemische</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="540"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation>Dekompressionsrechnung wegen Zeitüberschreitung abgebrochen</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="548"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation>basierend auf GF niedrig = %d und GF hoch = %d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="544"/>
+        <location filename="../planner.c" line="551"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface Tauchplan</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="548"/>
+        <location filename="../planner.c" line="555"/>
         <source>depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="558"/>
         <source>runtime</source>
         <translation>Laufzeit</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="554"/>
+        <location filename="../planner.c" line="561"/>
         <source>duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="557"/>
+        <location filename="../planner.c" line="564"/>
         <source>gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="594"/>
+        <location filename="../planner.c" line="601"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Auf-/Abstieg bis %.*f %s in %d:%02d min - Runtime %d:%02u mit %s (Setpoint = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="602"/>
+        <location filename="../planner.c" line="609"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Aufstieg auf %.*f %s in %d:%02d min - Laufzeit %d:%02u mit %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="615"/>
+        <location filename="../planner.c" line="622"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Auf %.*f %s bleiben für %d:%02d min - Runtime %d:%02u mit %s (Setpoint = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="622"/>
+        <location filename="../planner.c" line="629"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Verbleibe auf %.*f %s für %d:%02d min - Gesamtzeit %d:%02u mit %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="635"/>
+        <location filename="../planner.c" line="642"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="638"/>
-        <location filename="../planner.c" line="642"/>
+        <location filename="../planner.c" line="645"/>
+        <location filename="../planner.c" line="649"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="651"/>
+        <location filename="../planner.c" line="658"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="676"/>
+        <location filename="../planner.c" line="683"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Wechsle Gas auf %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="678"/>
+        <location filename="../planner.c" line="685"/>
         <source>Switch gas to %s</source>
         <translation>Gaswechsel zu %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="697"/>
+        <location filename="../planner.c" line="704"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="699"/>
+        <location filename="../planner.c" line="706"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="710"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Gasverbrauch (ohne CCR Segmente):</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="705"/>
+        <location filename="../planner.c" line="712"/>
         <source>Gas consumption:</source>
         <translation>Gasverbrauch:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="535"/>
-        <location filename="../planner.c" line="725"/>
-        <location filename="../planner.c" line="730"/>
-        <location filename="../planner.c" line="753"/>
+        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="732"/>
+        <location filename="../planner.c" line="737"/>
+        <location filename="../planner.c" line="762"/>
+        <location filename="../planner.c" line="772"/>
         <source>Warning:</source>
         <translation>Warnung:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="523"/>
+        <location filename="../planner.c" line="530"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
         <translation>HAFTUNGSAUSSCHLUSS / WARNUNG: DIES IST EINE NEUE IMPLEMENTATION DES BÜHLMANN-ALGORITHMUS UND EINES DARAUF BASIERENDEN TAUCHPLANERS, DIE NUR EINGESCHRÄNKT GETESTET WURDE. WIR RATEN DRINGENST, KEINE TAUCHGÄNGE DURCHZUFÜHREN, DIE NUR AUF DEN HIER ERSTELLTEN DATEN BERUHEN.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="726"/>
+        <location filename="../planner.c" line="733"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>Dies ist mehr Gas, als in der Flasche verfügbar ist!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="731"/>
+        <location filename="../planner.c" line="738"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>Keine ausreichende Reserve für Aufstieg unter Wechselatmung!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="733"/>
+        <location filename="../planner.c" line="740"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s %s (%.0f%s/%.0f%s im berechneten Aufstieg)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="735"/>
+        <location filename="../planner.c" line="742"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s im berechneten Aufstiegs) von %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="759"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>hoher pO₂ Wert %.2f auf %d:%02u mit Gas %s in Tiefe %.*f %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="1064"/>
+        <location filename="../planner.c" line="769"/>
+        <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="1085"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1099"/>
+        <location filename="../profile.c" line="1113"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -5957,70 +6213,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1102"/>
+        <location filename="../profile.c" line="1116"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1106"/>
+        <location filename="../profile.c" line="1120"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1112"/>
+        <location filename="../profile.c" line="1126"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1115"/>
+        <location filename="../profile.c" line="1129"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1117"/>
+        <location filename="../profile.c" line="1131"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1119"/>
+        <location filename="../profile.c" line="1133"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1121"/>
+        <location filename="../profile.c" line="1135"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1123"/>
+        <location filename="../profile.c" line="1137"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1140"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1147"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -6029,7 +6285,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1137"/>
+        <location filename="../profile.c" line="1151"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -6038,148 +6294,148 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1149"/>
+        <location filename="../profile.c" line="1163"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Sicherheitsstopp: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1152"/>
+        <location filename="../profile.c" line="1166"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Sicherheitsstopp: unbek. Zeit @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1157"/>
+        <location filename="../profile.c" line="1171"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1174"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deko: unbek. Zeit @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1178"/>
         <source>In deco
 </source>
         <translation>In Deko
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1166"/>
+        <location filename="../profile.c" line="1180"/>
         <source>NDL: %umin
 </source>
         <translation>Nullzeit: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1183"/>
         <source>TTS: %umin
 </source>
         <translation>Gesamtaufstiegszeit: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1172"/>
+        <location filename="../profile.c" line="1186"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1180"/>
+        <location filename="../profile.c" line="1194"/>
         <source>In deco (calc)
 </source>
         <translation>Deko (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1196"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>Nullzeit: %umin (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1185"/>
+        <location filename="../profile.c" line="1199"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>Gesamtaufstiegszeit: %umin (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1188"/>
+        <location filename="../profile.c" line="1202"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Berechneter tiefster Deko-Stopp %.0f %s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1194"/>
+        <location filename="../profile.c" line="1208"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Gewebe %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1214"/>
         <source>heartbeat: %d
 </source>
         <translation>Herzschlag: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1202"/>
+        <location filename="../profile.c" line="1216"/>
         <source>bearing: %d
 </source>
         <translation>Peilung: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1205"/>
+        <location filename="../profile.c" line="1219"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1314"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1304"/>
-        <location filename="../profile.c" line="1308"/>
-        <location filename="../profile.c" line="1312"/>
+        <location filename="../profile.c" line="1318"/>
+        <location filename="../profile.c" line="1322"/>
+        <location filename="../profile.c" line="1326"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sTiefe:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1316"/>
+        <location filename="../profile.c" line="1330"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sTiefe:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1334"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1324"/>
-        <location filename="../profile.c" line="1328"/>
+        <location filename="../profile.c" line="1338"/>
+        <location filename="../profile.c" line="1342"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1335"/>
+        <location filename="../profile.c" line="1349"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sDruck:%d %s</translation>
     </message>
@@ -6310,6 +6566,7 @@ EADD: %d%s
     </message>
     <message>
         <location filename="../dive.c" line="30"/>
+        <location filename="../equipment.c" line="85"/>
         <source>oxygen</source>
         <translation>Sauerstoff</translation>
     </message>
@@ -6364,97 +6621,97 @@ EADD: %d%s
         <translation>(keine Tauchgänge)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sun</source>
         <translation>So</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Mon</source>
         <translation>Mo</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Tue</source>
         <translation>Di</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Wed</source>
         <translation>Mi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Thu</source>
         <translation>Do</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Fri</source>
         <translation>Fr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sat</source>
         <translation>Sa</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Mar</source>
         <translation>Mär</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
@@ -7058,13 +7315,13 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <translation>Planung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
         <source>GF low</source>
         <translation>GF niedrig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>%</source>
         <translation>%</translation>
     </message>
@@ -7074,7 +7331,7 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <translation>GF hoch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="335"/>
         <source>Drop to first depth</source>
         <translation>Direkter Abstieg zur ersten Tiefe</translation>
     </message>
@@ -7084,69 +7341,69 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <translation>Letzter Stopp auf 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
         <source>Plan backgas breaks</source>
         <translation>Plane backgas Pausen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="355"/>
         <source>Gas options</source>
         <translation>Gas Optionen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="376"/>
         <source>Bottom SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="383"/>
         <source>Deco SAC</source>
         <translation>Deko SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="380"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="390"/>
         <source>Bottom pO₂</source>
         <translation>Grund pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="403"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="413"/>
         <source>Deco pO₂</source>
         <translation>Deko pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="449"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="462"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="478"/>
         <source>Dive notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
         <source>Display runtime</source>
         <translation>Zeige runtime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <source>Display segment duration</source>
         <translation>Zeige Segmentdauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="531"/>
         <source>Display transitions in deco</source>
         <translation>Aufstiege in der Deko anzeigen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="538"/>
         <source>Verbatim dive plan</source>
         <translation>Ausführlicher Tauchplan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="387"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="410"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="397"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -7166,17 +7423,17 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <translation>6m bis Oberfläche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="499"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>Zeige runtime (absolute Zeit) der Stopps im Tauchplan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="515"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>Zeige Dauer (relative Zeit) der Stopps im Tauchplan.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>Zeige Aufstiege im Tauchplen oder behandle sie als implizit</translation>
     </message>
diff --git a/translations/subsurface_de_DE.ts b/translations/subsurface_de_DE.ts
index 05303f3ac..6ea1b8efd 100644
--- a/translations/subsurface_de_DE.ts
+++ b/translations/subsurface_de_DE.ts
@@ -3,12 +3,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="539"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="522"/>
         <source>Person: </source>
         <translation>Person: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="540"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="523"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Sucht nach Tauchgruppenleiter und Tauchpartner</translation>
     </message>
@@ -16,40 +16,188 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="233"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="230"/>
         <source>No buddies</source>
         <translation>Keine Tauchpartner</translation>
     </message>
 </context>
 <context>
+    <name>ColumnNameProvider</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>GPS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Avg depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="210"/>
+        <location filename="../configuredivecomputer.cpp" line="212"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation>Sicherungsdatei %1 konnte nicht gespeichert werden. Fehlermeldung: %2</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="226"/>
+        <location filename="../configuredivecomputer.cpp" line="228"/>
         <source>Could not open backup file: %1</source>
         <translation>Sicherungsdatei konnte nicht geöffnet werden: %1</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="542"/>
+        <location filename="../configuredivecomputer.cpp" line="552"/>
         <source>Dive computer details read successfully</source>
         <translation>Tauchcomputerdetails erfolgreich gelesen</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="551"/>
+        <location filename="../configuredivecomputer.cpp" line="561"/>
         <source>Setting successfully written to device</source>
         <translation>Einstellungen erfolgreich übertragen</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="560"/>
+        <location filename="../configuredivecomputer.cpp" line="570"/>
         <source>Device firmware successfully updated</source>
         <translation>Geräte-Firmware erfolgreich aktualisiert</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="569"/>
+        <location filename="../configuredivecomputer.cpp" line="579"/>
         <source>Device settings successfully reset</source>
         <translation>Geräte-Einstellungen erfolgreich zurückgesetzt</translation>
     </message>
@@ -847,72 +995,72 @@
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1053"/>
         <source>Backup files (*.xml)</source>
         <translation>Sicherungsdateien (*.xml)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1037"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>Beim Speichern der Datensicherungsdatei ist ein Fehler aufgetreten.
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1040"/>
         <source>Backup succeeded</source>
         <translation>Sicherung abgeschlossen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1041"/>
         <source>Your settings have been saved to: %1</source>
         <translation>Ihre Einstellungen wurden gespeichert nach: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1030"/>
         <source>Backup dive computer settings</source>
         <translation>Tauchcomputereinstellungen sichern</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1036"/>
         <source>XML backup error</source>
         <translation>XML-Sicherungsfehler</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1052"/>
         <source>Restore dive computer settings</source>
         <translation>Tauchcomputereinstellungen wiederherstellen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1056"/>
         <source>XML restore error</source>
         <translation>XML-Wiederherstellungsfehler</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1057"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>Beim Wiederherstellen der Datensicherungsdatei ist ein Fehler aufgetreten.
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1063"/>
         <source>Restore succeeded</source>
         <translation>Wiederherstellung abgeschlossen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1064"/>
         <source>Your settings have been restored successfully.</source>
         <translation>Ihre Einstellungen wurden erfolgreich wiederhergestellt.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1074"/>
         <source>Select firmware file</source>
         <translation>Firmwaredatei auswählen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1075"/>
         <source>All files (*.*)</source>
         <translation>Alle Dateien (*.*)</translation>
     </message>
@@ -970,12 +1118,12 @@
         <translation>Hier klicken entfernt diese Flasche.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="410"/>
         <source>Cylinder cannot be removed</source>
         <translation>Flasche kann nicht entfernt werden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="407"/>
+        <location filename="../qt-ui/models.cpp" line="411"/>
         <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>
@@ -1051,12 +1199,12 @@
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="48"/>
         <source>Remove the selected dive computer?</source>
         <translation>Ausgewählten Tauchcomputer entfernen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="49"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
         <translation>Tauchcomputer wirklich entfernen?</translation>
@@ -1070,22 +1218,22 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Model</source>
         <translation>Modell</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Device ID</source>
         <translation>Gerätekennung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Nickname</source>
         <translation>Gerätename</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Hier klicken entfernt diesen Tauchcomputer.</translation>
     </message>
@@ -1093,117 +1241,145 @@
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="115"/>
         <source>Bailing out to OC</source>
         <translation>Notausstieg mit offenem System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="117"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> Anfang</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> Ende</translation>
     </message>
 </context>
 <context>
+    <name>DiveImportedModel</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="556"/>
+        <source>Date/time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
+        <source>Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>h:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>min</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1242"/>
+        <location filename="../qt-ui/models.cpp" line="1248"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1245"/>
+        <location filename="../qt-ui/models.cpp" line="1251"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1248"/>
+        <location filename="../qt-ui/models.cpp" line="1254"/>
         <source>Rating</source>
         <translation>Bewertung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Depth(%1)</source>
         <translation>Tiefe(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1254"/>
+        <location filename="../qt-ui/models.cpp" line="1260"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1263"/>
         <source>Temp(%1%2)</source>
         <translation>Temp(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>Weight(%1)</source>
         <translation>Gewicht(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1263"/>
+        <location filename="../qt-ui/models.cpp" line="1269"/>
         <source>Suit</source>
         <translation>Anzug</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1266"/>
+        <location filename="../qt-ui/models.cpp" line="1272"/>
         <source>Cyl</source>
         <translation>Flasche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1269"/>
+        <location filename="../qt-ui/models.cpp" line="1275"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>SAC(%1)</source>
         <translation>AMV(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1277"/>
+        <location filename="../qt-ui/models.cpp" line="1283"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1280"/>
+        <location filename="../qt-ui/models.cpp" line="1286"/>
         <source>Max CNS</source>
         <translation>Max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1283"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>Location</source>
         <translation>Ort</translation>
     </message>
@@ -1211,87 +1387,87 @@
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="787"/>
+        <location filename="../qt-ui/divelistview.cpp" line="768"/>
         <source>Expand all</source>
         <translation>Alle ausfalten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="788"/>
+        <location filename="../qt-ui/divelistview.cpp" line="769"/>
         <source>Collapse all</source>
         <translation>Alle einfalten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="789"/>
+        <location filename="../qt-ui/divelistview.cpp" line="770"/>
         <source>Collapse others</source>
         <translation>Andere einklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="791"/>
+        <location filename="../qt-ui/divelistview.cpp" line="772"/>
         <source>Remove dive(s) from trip</source>
         <translation>Entferne Tauchgäng(e) aus Reise</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="792"/>
+        <location filename="../qt-ui/divelistview.cpp" line="773"/>
         <source>Create new trip above</source>
         <translation>Neue Reise darüber einfügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="806"/>
+        <location filename="../qt-ui/divelistview.cpp" line="787"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Tauchgäng(e) zur Reise darüber hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="808"/>
+        <location filename="../qt-ui/divelistview.cpp" line="789"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Tauchgäng(e) zur Reise darunter hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="812"/>
+        <location filename="../qt-ui/divelistview.cpp" line="793"/>
         <source>Merge trip with trip above</source>
         <translation>Reise mit der darüber verbinden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="813"/>
+        <location filename="../qt-ui/divelistview.cpp" line="794"/>
         <source>Merge trip with trip below</source>
         <translation>Reise mit der darunter verbinden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="817"/>
+        <location filename="../qt-ui/divelistview.cpp" line="798"/>
         <source>Delete dive(s)</source>
         <translation>Tauchgäng(e) löschen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="819"/>
+        <location filename="../qt-ui/divelistview.cpp" line="800"/>
         <source>Mark dive(s) invalid</source>
         <translation>Tauchgäng(e) als ungültig markieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="823"/>
+        <location filename="../qt-ui/divelistview.cpp" line="804"/>
         <source>Merge selected dives</source>
         <translation>Ausgewählte Tauchgänge zusammenführen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="825"/>
+        <location filename="../qt-ui/divelistview.cpp" line="806"/>
         <source>Renumber dive(s)</source>
         <translation>Tauchgänge neu nummerieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="826"/>
+        <location filename="../qt-ui/divelistview.cpp" line="807"/>
         <source>Shift times</source>
         <translation>Zeiten verschieben</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="827"/>
+        <location filename="../qt-ui/divelistview.cpp" line="808"/>
         <source>Load images</source>
         <translation>Bilder laden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Open image files</source>
         <translation>Öffne Bilddateien</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Bilddateien (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -1476,100 +1652,100 @@
         <translation>Sand</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF Dateien (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="268"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>CSV Dateien (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="68"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Generisches Format, welches zum Datenaustausch in diversen Taucherprogrammen verwendet wird.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>Kommagetrennte Werte, die das Tauchprofil beschreiben</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
-        <translation type="unfinished"/>
+        <translation>Durch Kommata getrennte Werte (CSV) des Taugang. Beinhaltet die meisten Tauchgangsdetauls aber keine Profilinformation.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Tauchdaten an die divelogs.de-Webseite senden.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>Tauchdaten an die dive-share.appspot.com-Webseite senden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>HTML-Export der Tauchplätze, visualisiert auf einer Weltkarte.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
         <source>Subsurface native XML format.</source>
         <translation>Natives Subsurface XML-Format</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
         <source>Write depths of images to file.</source>
         <translation>Tiefe, in der das Bild aufgenommen wurde, in die Datei schreiben</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export UDDF file as</source>
         <translation>UDDF-Datei exportieren als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="267"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
         <source>Export CSV file as</source>
         <translation>CSV-Datei exportieren als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="278"/>
         <source>Export world map</source>
         <translation>Weltkarte exportieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="299"/>
         <source>HTML files (*.html)</source>
         <translation>HTML Dateien (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="283"/>
         <source>Export Subsurface XML</source>
         <translation>Exportiere Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="284"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML Dateien (*.xml, *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
         <source>Save image depths</source>
         <translation>Tiefe speichern, in der das Bild aufgenommen wurde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="298"/>
         <source>Export HTML files as</source>
         <translation>HTML-Datei exportieren als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
         <source>Can&apos;t open file %s</source>
         <translation>Kann Datei %s nicht öffnen</translation>
     </message>
@@ -1582,248 +1758,228 @@
         <translation>Tauchprotokolldatei importieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
-        <source>CSV options</source>
-        <translation>CSV Optionen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="281"/>
-        <source>Pre-configured imports</source>
-        <translation>Vorkonfigurierte Importe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="122"/>
-        <source>Depth</source>
-        <translation>Tiefe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="142"/>
-        <source>Stopdepth</source>
-        <translation>Stopptiefe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="162"/>
-        <source>Pressure</source>
-        <translation>Druck</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="176"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="466"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
         <source>Time</source>
         <translation>Zeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="183"/>
-        <source>Temp</source>
-        <translation>Temperatur</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="213"/>
-        <source>NDL</source>
-        <translation>Nullzeit</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="233"/>
-        <source>TTS</source>
-        <translation>Gesamtaufstiegszeit</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="253"/>
-        <source>Cns</source>
-        <translation>CNS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="58"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="789"/>
-        <source>Field separator</source>
-        <translation>Feldtrenner</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="35"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="363"/>
-        <source>Units</source>
-        <translation>Einheiten</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="42"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="370"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="97"/>
         <source>Metric</source>
         <translation>Metrisch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="47"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="375"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="102"/>
         <source>Imperial</source>
         <translation>Zöllig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="169"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="298"/>
-        <source>Manual dives</source>
-        <translation>Manuelle Tauchgänge</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="316"/>
-        <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source>
-        <translation>Bitte Reihenfolge von Tag, Monat und Jahr im Datumsformat wählen. Das Trennzeichen kann eines aus .-/ sein.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="319"/>
-        <source>Date format</source>
-        <translation>Datumsformat</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="332"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="59"/>
         <source>dd.mm.yyyy</source>
         <translation>tt.mm.jjjj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="337"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="64"/>
         <source>mm/dd/yyyy</source>
         <translation>mm/tt/jjjj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="342"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="69"/>
         <source>yyyy-mm-dd</source>
         <translation>jjjj-mm-tt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="392"/>
-        <source>Dive #</source>
-        <translation>Tauchgang Nr.</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="426"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="439"/>
-        <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source>
-        <translation>Datum als tt.mm.jjjj, jjjj-mm-tt oder mm/tt/jjjj</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+        <source>Dive #</source>
+        <translation>Tauchgang Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="429"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="500"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="513"/>
-        <source>Dive duration in seconds or in min:sec format</source>
-        <translation>Tauchgangsdauer in Sekunden oder als min:sec</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="503"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="574"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="591"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
         <source>Tags</source>
         <translation>Stichwörter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="608"/>
-        <source>Cyl size</source>
-        <translation>Zyl.-größe</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+        <source>O₂</source>
+        <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="625"/>
-        <source>Air temp</source>
-        <translation>Lufttemperatur</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+        <source>He</source>
+        <translation>He</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="642"/>
-        <source>Start Pressure</source>
-        <translation>Anfangsdruck</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="78"/>
+        <source>Seconds</source>
+        <translation>Sekunden</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
+        <source>Minutes</source>
+        <translation>Minuten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="659"/>
-        <source>Water temp</source>
-        <translation>Wassertemperatur</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="88"/>
+        <source>Minutes:seconds</source>
+        <translation>Minuten:Sekunden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="676"/>
-        <source>End Press</source>
-        <translation>Enddruck</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+        <source>Location</source>
+        <translation>Ort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="693"/>
-        <source>O₂</source>
-        <translation>O₂</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+        <source>Max depth</source>
+        <translation>Max. Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="710"/>
-        <source>He</source>
-        <translation>He</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+        <source>Tab</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="742"/>
-        <source>Choose duration format.</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="745"/>
-        <source>Duration format</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+        <source>Sample time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="758"/>
-        <source>Seconds</source>
-        <translation>Sekunden</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="763"/>
-        <source>Minutes</source>
-        <translation>Minuten</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="768"/>
-        <source>Minutes:seconds</source>
-        <translation>Minuten:Sekunden</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="540"/>
-        <source>Location</source>
-        <translation>Ort</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="409"/>
-        <source>Max depth</source>
-        <translation>Max. Tiefe</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="386"/>
-        <source>Field configuration</source>
-        <translation>Feldkonfiguration</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+        <source>Samples pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
         <source>Mean depth</source>
         <translation>Mittlere Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="483"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
         <source>Buddy</source>
         <translation>Tauchpartner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="523"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
         <source>Notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="557"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DivePlanner</name>
@@ -1866,42 +2022,42 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="691"/>
         <source>Final depth</source>
         <translation>Endtiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="693"/>
         <source>Run time</source>
         <translation>Laufzeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="701"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="695"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="703"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
         <source>Used gas</source>
         <translation>Gasverbrauch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="705"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
         <source>CC set point</source>
         <translation>CC Set Point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1044"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1051"/>
         <source>Discard the plan?</source>
         <translation>Diese Planung verwerfen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1045"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1052"/>
         <source>You are about to discard your plan.</source>
         <translation>Du bist dabei Deinen Plan zu verwerfen.</translation>
     </message>
@@ -1909,22 +2065,22 @@
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="257"/>
         <source>Dive planner points</source>
         <translation>Planerpunkte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="261"/>
         <source>Available gases</source>
         <translation>Verfügbare Gase</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="284"/>
         <source>Add dive data point</source>
         <translation>Datenpunkt hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="304"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="293"/>
         <source>Save new</source>
         <translation>Neue speichern</translation>
     </message>
@@ -1932,92 +2088,112 @@
 <context>
     <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
         <source>Time</source>
         <translation>Zeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
         <source>Pressure</source>
         <translation>Druck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
         <source>Color</source>
         <translation>Farbe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
         <source>Pressure S</source>
         <translation>Druck S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
+        <source>Setpoint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
+        <source>Sensor1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
+        <source>Sensor2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
+        <source>Sensor3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
         <source>Ambient pressure</source>
         <translation>Umgebungsdruck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
-        <source>Heart Beat</source>
-        <translation>Herzschlag</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
+        <source>Heart beat</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
-        <source>Gradient Factor</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/>
+        <source>Gradient factor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
-        <source>Mean Depth/s</source>
-        <translation>Mittlere Tiefe/s</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
+        <source>Mean depth/s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
         <source>Pressure I</source>
         <translation>Druck I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
         <source>User entered</source>
         <translation>Benutzer Eingabe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
         <source>Cylinder index</source>
         <translation>Flaschen Index</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
         <source>Ceiling</source>
         <translation>Tiefster Deko-Stopp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
         <source>SAC</source>
         <translation>AMV</translation>
     </message>
@@ -2068,127 +2244,127 @@
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1437"/>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1443"/>
+        <location filename="../qt-ui/models.cpp" line="1489"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1440"/>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1492"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1443"/>
-        <location filename="../qt-ui/models.cpp" line="1489"/>
+        <location filename="../qt-ui/models.cpp" line="1449"/>
+        <location filename="../qt-ui/models.cpp" line="1495"/>
         <source>Rating</source>
         <translation>Bewertung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1452"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1458"/>
         <source>Temp</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1461"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>SAC</source>
         <translation>AMV</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>Weight(%1)</source>
         <translation>Gewicht(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1458"/>
-        <location filename="../qt-ui/models.cpp" line="1504"/>
+        <location filename="../qt-ui/models.cpp" line="1464"/>
+        <location filename="../qt-ui/models.cpp" line="1510"/>
         <source>Suit</source>
         <translation>Anzug</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1461"/>
-        <location filename="../qt-ui/models.cpp" line="1507"/>
+        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1513"/>
         <source>Cyl</source>
         <translation>Flasche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1464"/>
-        <location filename="../qt-ui/models.cpp" line="1510"/>
+        <location filename="../qt-ui/models.cpp" line="1470"/>
+        <location filename="../qt-ui/models.cpp" line="1516"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>SAC(%1)</source>
         <translation>AMV(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1473"/>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1527"/>
         <source>Max CNS</source>
         <translation>Max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
-        <location filename="../qt-ui/models.cpp" line="1524"/>
+        <location filename="../qt-ui/models.cpp" line="1482"/>
+        <location filename="../qt-ui/models.cpp" line="1530"/>
         <source>Location</source>
         <translation>Ort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>Depth(%1)</source>
         <translation>Tiefe(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1449"/>
-        <location filename="../qt-ui/models.cpp" line="1495"/>
+        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1501"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1498"/>
+        <location filename="../qt-ui/models.cpp" line="1504"/>
         <source>Temp(%1%2)</source>
         <translation>Temp(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1470"/>
-        <location filename="../qt-ui/models.cpp" line="1518"/>
+        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1524"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -2196,95 +2372,95 @@
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="98"/>
         <source>no dives were selected</source>
         <translation>keine Tauchgänge ausgewählt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="117"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>konnte keine zip-Datei zum Hochladen erstellen: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="143"/>
         <source>cannot create temporary file: %s</source>
         <translation>kann keine temporäre Datei erstellen: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/>
         <source>internal error: %s</source>
         <translation>ein Fehler ist aufgetreten: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="169"/>
         <source>internal error</source>
         <translation>ein interner Fehler ist aufgetreten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="629"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="828"/>
         <source>Done</source>
         <translation>Fertig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/>
         <source>Uploading dive list...</source>
         <translation>Liste der Tauchgänge wird hochgeladen...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="692"/>
         <source>Downloading dive list...</source>
         <translation>Liste der Tauchgänge herunterladen...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="741"/>
         <source>Downloading %1 dives...</source>
         <translation>Lade %1 Tauchgänge vom Server...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="785"/>
         <source>Download finished - %1</source>
         <translation>Herunterladen beendet - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="802"/>
         <source>Corrupted download</source>
         <translation>Heruntergeladene Daten sind beschädigt.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Das Archiv konnte nicht geöffnet werden
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
         <source>Upload failed</source>
         <translation>Hochladen fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/>
         <source>Upload successful</source>
         <translation>Hochladen erfolgreich</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
         <source>Login failed</source>
         <translation>Anmeldung fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
         <source>Cannot parse response</source>
         <translation>Verstehe die Antwort nicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
         <source>Error: %1</source>
         <translation>Fehler: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="829"/>
         <source>Upload finished</source>
         <translation>Hochladen abgeschlossen</translation>
     </message>
@@ -2292,54 +2468,52 @@
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="169"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="400"/>
         <source>Retry</source>
         <translation>Wiederholen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="264"/>
         <source>Find Uemis dive computer</source>
         <translation>Finde Uemis Tauchcomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Wählen Sie die Datei zum Herunterladen der Tauchcomputer-Protokolldatei aus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Log files (*.log)</source>
         <translation>Protokolldateien (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="362"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="363"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>Wenn der libdivecomputer Dump gespeichert wird, werden keine Tauchgänge zur Liste der Tauchgänge hinzugefügt.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="374"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Datei auswählen, in die der libdivecomputer Dump gespeichert werden soll</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="375"/>
         <source>Dump files (*.bin)</source>
         <translation>Dump Dateien (*.bin)</translation>
     </message>
@@ -2347,7 +2521,7 @@
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="101"/>
         <source>Vendor</source>
         <translation>Hersteller</translation>
     </message>
@@ -2357,54 +2531,74 @@
         <translation>Von Tauchcomputer laden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="31"/>
         <source>Device or mount point</source>
         <translation>Gerät oder Einhängepunkt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="111"/>
         <source>Dive computer</source>
         <translation>Tauchcomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="132"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="45"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="80"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="94"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="52"/>
         <source>Force download of all dives</source>
         <translation>Erneutes Laden aller Tauchgänge erzwingen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
         <source>Always prefer downloaded dives</source>
         <translation>Heruntergeladene Tauchgänge immer bevorzugen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="189"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/>
+        <source>Downloaded Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
+        <source>Select all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
+        <source>Unselect all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
         <source>Save libdivecomputer logfile</source>
         <translation>libdivecomputer-Protokolldatei speichern</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="87"/>
         <source>Save libdivecomputer dumpfile</source>
         <translation>Dump Datei der libdivecomputer Übertragung speichern</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
         <source>Download into new trip</source>
         <translation>Download in neue Reise</translation>
     </message>
@@ -2412,12 +2606,12 @@
 <context>
     <name>ExtraDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Key</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Value</source>
         <translation>Wert</translation>
     </message>
@@ -2431,22 +2625,20 @@
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="245"/>
-        <source>Your dive profile was updated to facebook.</source>
-        <translation>Ihr Tauchprofil auf Facebook wurde aktualisiert.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
-        <source>Photo Upload Failed</source>
-        <translation>Hochladen des Fotos ist fehlgeschlagen</translation>
+        <source>Your dive profile was updated to Facebook.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="250"/>
-        <source>Your dive profile was not updated to facebook, 
+        <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
-        <translation>Ihr Tauchprofil auf Facebook wurde nicht aktualisiert, 
-bitte senden Sie Folgendes an die Entwickler. 
-</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+        <source>Photo Upload Failed</source>
+        <translation>Hochladen des Fotos ist fehlgeschlagen</translation>
     </message>
 </context>
 <context>
@@ -2488,17 +2680,17 @@ bitte senden Sie Folgendes an die Entwickler.
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1544"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1621"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Diese Funktion ist für den ausgewählten Tauchcomputer noch nicht verfügbar.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1624"/>
         <source>Firmware update failed!</source>
         <translation>Firmware-Aktualisierung fehlgeschlagen!</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1550"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1627"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Verbindung zum Tauchcomputer konnte nicht hergestellt werden.</translation>
     </message>
@@ -2506,7 +2698,7 @@ bitte senden Sie Folgendes an die Entwickler.
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="128"/>
+        <location filename="../qt-ui/globe.cpp" line="119"/>
         <source>Edit selected dive locations</source>
         <translation>Ausgewählte Tauchplätze bearbeiten</translation>
     </message>
@@ -2514,7 +2706,7 @@ bitte senden Sie Folgendes an die Entwickler.
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="566"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="549"/>
         <source>Location: </source>
         <translation>Ort:</translation>
     </message>
@@ -2522,7 +2714,7 @@ bitte senden Sie Folgendes an die Entwickler.
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="286"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="283"/>
         <source>No location set</source>
         <translation>Kein Ort festgelegt</translation>
     </message>
@@ -2530,330 +2722,335 @@ bitte senden Sie Folgendes an die Entwickler.
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="133"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
+        <location filename="../qt-ui/maintab.cpp" line="497"/>
         <source>Location</source>
         <translation>Ort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="67"/>
         <source>Coordinates</source>
         <translation>Koordinaten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="169"/>
         <source>Divemaster</source>
         <translation>Tauchgruppenleiter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="154"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Buddy</source>
         <translation>Tauchpartner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="222"/>
+        <location filename="../qt-ui/maintab.ui" line="277"/>
         <source>Tags</source>
         <translation>Stichwörter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="186"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
         <source>Rating</source>
         <translation>Bewertung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="221"/>
         <source>Visibility</source>
         <translation>Sicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="230"/>
         <source>Suit</source>
         <translation>Anzug</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="465"/>
+        <location filename="../qt-ui/maintab.cpp" line="470"/>
         <source>Dive notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
-        <location filename="../qt-ui/maintab.ui" line="648"/>
-        <location filename="../qt-ui/maintab.cpp" line="277"/>
+        <location filename="../qt-ui/maintab.ui" line="74"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="102"/>
+        <location filename="../qt-ui/maintab.ui" line="677"/>
+        <location filename="../qt-ui/maintab.cpp" line="279"/>
         <source>Air temp.</source>
         <translation>Lufttemp.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <location filename="../qt-ui/maintab.ui" line="667"/>
-        <location filename="../qt-ui/maintab.cpp" line="278"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.ui" line="696"/>
+        <location filename="../qt-ui/maintab.cpp" line="280"/>
         <source>Water temp.</source>
         <translation>Wassertemp.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="229"/>
-        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.ui" line="284"/>
+        <location filename="../qt-ui/maintab.cpp" line="498"/>
         <source>Notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="369"/>
+        <location filename="../qt-ui/maintab.ui" line="398"/>
         <source>Equipment</source>
         <translation>Ausrüstung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="496"/>
+        <location filename="../qt-ui/maintab.ui" line="525"/>
         <source>Gases used</source>
         <translation>Verw. Gase</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="515"/>
+        <location filename="../qt-ui/maintab.ui" line="544"/>
         <source>Gas consumed</source>
         <translation>Gasverbrauch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="553"/>
+        <location filename="../qt-ui/maintab.ui" line="582"/>
         <source>CNS</source>
         <translation>CND</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="591"/>
+        <location filename="../qt-ui/maintab.ui" line="620"/>
         <source>Max. depth</source>
         <translation>Max. Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="629"/>
+        <location filename="../qt-ui/maintab.ui" line="658"/>
         <source>Air pressure</source>
         <translation>Luftdruck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="686"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>Dive time</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="845"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
         <source>Total time</source>
         <translation>Gesamtzeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="903"/>
+        <location filename="../qt-ui/maintab.ui" line="932"/>
         <source>Gas consumption</source>
         <translation>Gasverbrauch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="962"/>
+        <location filename="../qt-ui/maintab.ui" line="991"/>
         <source>Extra data</source>
         <translation>Zusatzdaten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="968"/>
+        <location filename="../qt-ui/maintab.ui" line="997"/>
         <source>Additional data from dive computer</source>
         <translation>Zusätzliche Daten vom Tauchcomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="54"/>
-        <location filename="../qt-ui/maintab.ui" line="458"/>
+        <location filename="../qt-ui/maintab.ui" line="83"/>
+        <location filename="../qt-ui/maintab.ui" line="487"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="61"/>
+        <location filename="../qt-ui/maintab.ui" line="90"/>
         <source>Time</source>
         <translation>Zeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="425"/>
+        <location filename="../qt-ui/maintab.ui" line="454"/>
         <source>Dive info</source>
         <translation>Informationen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="477"/>
+        <location filename="../qt-ui/maintab.ui" line="506"/>
         <source>Interval</source>
         <translation>Oberflächenpause</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="534"/>
-        <location filename="../qt-ui/maintab.ui" line="799"/>
+        <location filename="../qt-ui/maintab.ui" line="563"/>
+        <location filename="../qt-ui/maintab.ui" line="828"/>
         <source>SAC</source>
         <translation>AMV</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="610"/>
+        <location filename="../qt-ui/maintab.ui" line="639"/>
         <source>Avg. depth</source>
         <translation>Ø Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="572"/>
+        <location filename="../qt-ui/maintab.ui" line="601"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="734"/>
         <source>Salinity</source>
         <translation>Salzgehalt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="742"/>
+        <location filename="../qt-ui/maintab.ui" line="771"/>
         <source>Stats</source>
         <translation>Statistiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="775"/>
+        <location filename="../qt-ui/maintab.ui" line="804"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="787"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="813"/>
+        <location filename="../qt-ui/maintab.ui" line="842"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="864"/>
+        <location filename="../qt-ui/maintab.ui" line="893"/>
         <source>Dives</source>
         <translation>Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="948"/>
+        <location filename="../qt-ui/maintab.ui" line="977"/>
         <source>Photos</source>
         <translation>Bilder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="95"/>
+        <location filename="../qt-ui/maintab.cpp" line="87"/>
         <source>Cylinders</source>
         <translation>Flaschen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="99"/>
+        <location filename="../qt-ui/maintab.cpp" line="91"/>
         <source>Weights</source>
         <translation>Blei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="55"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Apply changes</source>
         <translation>Änderungen anwenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="59"/>
+        <location filename="../qt-ui/maintab.cpp" line="50"/>
         <source>Discard changes</source>
         <translation>Änderungen Verwerfen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="96"/>
+        <location filename="../qt-ui/maintab.cpp" line="88"/>
         <source>Add cylinder</source>
         <translation>Flasche hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="100"/>
+        <location filename="../qt-ui/maintab.cpp" line="92"/>
         <source>Add weight system</source>
         <translation>Gewicht hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="274"/>
+        <location filename="../qt-ui/maintab.cpp" line="276"/>
         <source>Air temp. [%1]</source>
         <translation>Lufttemp. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="275"/>
+        <location filename="../qt-ui/maintab.cpp" line="277"/>
         <source>Water temp. [%1]</source>
         <translation>Wassertemp. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="312"/>
+        <location filename="../qt-ui/maintab.cpp" line="314"/>
         <source>This trip is being edited.</source>
         <translation>Diese Reise wird bearbeitet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="320"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Multiple dives are being edited.</source>
         <translation>Mehrere Tauchgänge werden bearbeitet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.cpp" line="324"/>
         <source>This dive is being edited.</source>
         <translation>Dieser Tauchgang wird bearbeitet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="436"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
+        <location filename="../qt-ui/maintab.cpp" line="465"/>
         <source>Trip notes</source>
         <translation>Reisenotizen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="458"/>
+        <location filename="../qt-ui/maintab.cpp" line="463"/>
         <source>Trip location</source>
         <translation>Reiseort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="526"/>
-        <location filename="../qt-ui/maintab.cpp" line="558"/>
-        <location filename="../qt-ui/maintab.cpp" line="562"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
         <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="574"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="555"/>
+        <location filename="../qt-ui/maintab.cpp" line="563"/>
         <source>Deepest dive</source>
         <translation>Tiefster Tauchgang</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="556"/>
+        <location filename="../qt-ui/maintab.cpp" line="564"/>
         <source>Shallowest dive</source>
         <translation>Flachster Tauchgang</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="569"/>
+        <location filename="../qt-ui/maintab.cpp" line="577"/>
         <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="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="578"/>
         <source>Lowest total SAC of a dive</source>
         <translation>Niedrigster gesamt SAC eines Tauchganges</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="571"/>
+        <location filename="../qt-ui/maintab.cpp" line="579"/>
         <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="582"/>
+        <location filename="../qt-ui/maintab.cpp" line="590"/>
         <source>Highest temperature</source>
         <translation>Höchste Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="583"/>
+        <location filename="../qt-ui/maintab.cpp" line="591"/>
         <source>Lowest temperature</source>
         <translation>Niedrigste Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="584"/>
+        <location filename="../qt-ui/maintab.cpp" line="592"/>
         <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="594"/>
+        <location filename="../qt-ui/maintab.cpp" line="602"/>
         <source>Longest dive</source>
         <translation>Längster Tauchgang</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="595"/>
+        <location filename="../qt-ui/maintab.cpp" line="603"/>
         <source>Shortest dive</source>
         <translation>Kürzester Tauchgang</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="596"/>
+        <location filename="../qt-ui/maintab.cpp" line="604"/>
         <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="620"/>
+        <location filename="../qt-ui/maintab.cpp" line="628"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -2862,17 +3059,17 @@ den folgenden Gasen gemischt werden:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="624"/>
+        <location filename="../qt-ui/maintab.cpp" line="632"/>
         <source> and </source>
         <translation>und</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="911"/>
+        <location filename="../qt-ui/maintab.cpp" line="925"/>
         <source>Discard the changes?</source>
         <translation>Änderungen verwerfen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="912"/>
+        <location filename="../qt-ui/maintab.cpp" line="926"/>
         <source>You are about to discard your changes.</source>
         <translation>Sie sind im Begriff, die Änderungen zu Verwerfen.</translation>
     </message>
@@ -3019,7 +3216,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="296"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="232"/>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
@@ -3379,90 +3576,90 @@ p, li { white-space: pre-wrap; }
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="252"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="229"/>
         <source>Open file</source>
         <translation>Datei öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="256"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="233"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="332"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="309"/>
         <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="444"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
         <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="491"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
         <source>Print runtime table</source>
         <translation>Laufzeittabelle anzeigen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="834"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="811"/>
         <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="836"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="813"/>
         <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="841"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="818"/>
         <source>Save changes?</source>
         <translation>Änderungen speichern?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1196"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1173"/>
         <source>Save file as</source>
         <translation>Datei speichern unter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1337"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1314"/>
         <source>Open dive log file</source>
         <translation>Tauchprotokolldatei öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="819"/>
         <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="300"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="444"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="277"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1180"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1157"/>
         <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="625"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="602"/>
         <source>Yearly statistics</source>
         <translation>Jahresstatistiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1197"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1174"/>
         <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="1338"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1315"/>
         <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source>
         <translation>Tauchprotokolldateien (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran-Dateien (*.can);;CSV-Dateien (*.csv);;DiveLog.de files (*.dld);;JDiveLog-Dateien (*.jlb);;Liquivision-Dateien (*.lvd);;MkVI files (*.txt);;Suunto-Dateien (*.sde *.db);;Divesoft-Dateien (*.dlf);;UDDF/UDCF-Dateien (*.uddf *.udcf);;XML-Dateien (*.xml);;Alle Dateien (*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <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>
@@ -3470,7 +3667,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="651"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="634"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Filter zeigt %1 (von %2) Tauchgängen</translation>
     </message>
@@ -3478,39 +3675,41 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="239"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation>Sie sollten die Firmware auf Ihrem Tauchcomputer aktualisieren: Sie haben Version %1, aber die neueste stabile Version ist %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="243"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
-        <translation type="unfinished"/>
+        <translation>
+
+Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie für ein Logbuchdownload treffen, bevor das Update fortgeführt wird.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="244"/>
         <source>Not now</source>
         <translation>Nicht jetzt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="245"/>
         <source>Update firmware</source>
         <translation>Firmware aktualisieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
         <source>Firmware upgrade notice</source>
         <translation>Firmware-Aktualisierungsbenachrichtigung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
         <source>Save the downloaded firmware as</source>
         <translation>Heruntergeladene Firmware speichern als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
         <source>HEX files (*.hex)</source>
         <translation>HEX-Dateien (*.hex)</translation>
     </message>
@@ -3518,54 +3717,69 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Open circuit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="481"/>
         <source>Last stop at 20ft</source>
         <translation>Letzter Stopp auf 20 Fuß</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="482"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% mitlerer Tiefe bis 20ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="489"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
         <source>20ft to surface</source>
         <translation>20ft bis Oberfläche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="485"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
         <source>Last stop at 6m</source>
         <translation>Letzter Stopp auf 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% mitlerer Tiefe bis 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="494"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
         <source>6m to surface</source>
         <translation>6m bis Oberfläche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="497"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="498"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
         <source>cuft/min</source>
         <translation>cft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="506"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="507"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="500"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="501"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
@@ -3684,6 +3898,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="816"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -3718,57 +3933,87 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="795"/>
+        <source>CCR: Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="809"/>
+        <source>Default CCR set-point for dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="832"/>
+        <source>pSCR O₂ metabolism rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="839"/>
+        <source>pSCR ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="846"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="859"/>
+        <source>1:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="875"/>
         <source>System default</source>
         <translation>Standardeinstellungen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="843"/>
+        <location filename="../qt-ui/preferences.ui" line="914"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="849"/>
+        <location filename="../qt-ui/preferences.ui" line="920"/>
         <source>Proxy type</source>
         <translation>Proxy-Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="862"/>
+        <location filename="../qt-ui/preferences.ui" line="933"/>
         <source>Host</source>
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="888"/>
+        <location filename="../qt-ui/preferences.ui" line="959"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="914"/>
+        <location filename="../qt-ui/preferences.ui" line="985"/>
         <source>Requires authentication</source>
         <translation>Anmeldung erforderlich</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="934"/>
+        <location filename="../qt-ui/preferences.ui" line="1005"/>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="957"/>
+        <location filename="../qt-ui/preferences.ui" line="1028"/>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="985"/>
-        <source>about:blank</source>
-        <translation>about:blank</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="1011"/>
-        <source>Disconnect from facebook</source>
-        <translation>Verbindung zu Facebook trennen</translation>
+        <location filename="../qt-ui/preferences.ui" line="1079"/>
+        <source>Disconnect from Facebook</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="824"/>
+        <location filename="../qt-ui/preferences.ui" line="895"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
@@ -3923,52 +4168,52 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>GF hoch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="28"/>
+        <location filename="../qt-ui/preferences.cpp" line="44"/>
         <source>No proxy</source>
         <translation>Kein Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="29"/>
+        <location filename="../qt-ui/preferences.cpp" line="45"/>
         <source>System proxy</source>
         <translation>Systemproxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="30"/>
+        <location filename="../qt-ui/preferences.cpp" line="46"/>
         <source>HTTP proxy</source>
         <translation>HTTP Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="31"/>
+        <location filename="../qt-ui/preferences.cpp" line="47"/>
         <source>SOCKS proxy</source>
         <translation>SOCKS Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="291"/>
+        <location filename="../qt-ui/preferences.cpp" line="324"/>
         <source>Restart required</source>
         <translation>Bitte Programm neu starten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="292"/>
+        <location filename="../qt-ui/preferences.cpp" line="325"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>Um die neue Sprache laden zu können, muss Subsurface neu gestartet werden.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="456"/>
+        <location filename="../qt-ui/preferences.cpp" line="494"/>
         <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
         <translation>Mit OK werden alle Einstellungen zurückgesetzt. Dies hat sofortige Wirkung.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Open default log file</source>
         <translation>Standard-Protokolldatei öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="455"/>
+        <location filename="../qt-ui/preferences.cpp" line="493"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
@@ -3976,17 +4221,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="91"/>
+        <location filename="../qt-ui/printdialog.cpp" line="85"/>
         <source>&amp;Preview</source>
         <translation>Vorschau</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="88"/>
+        <location filename="../qt-ui/printdialog.cpp" line="82"/>
         <source>P&amp;rint</source>
         <translation>Drucken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="103"/>
+        <location filename="../qt-ui/printdialog.cpp" line="97"/>
         <source>Print</source>
         <translation>Drucken</translation>
     </message>
@@ -3994,42 +4239,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="20"/>
         <source>Dive#</source>
         <translation>Tauchgang Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="21"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="22"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="23"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Master</source>
         <translation>Guide</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Buddy</source>
         <translation>Tauchpartner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="34"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Location</source>
         <translation>Ort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <location filename="../qt-ui/printlayout.cpp" line="63"/>
         <source>Subsurface cannot find a usable printer on this system!</source>
         <translation>Subsurface konnte keine nutzbaren Drucker finden.</translation>
     </message>
@@ -4095,72 +4340,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2095"/>
+        <location filename="../qt-ui/models.cpp" line="2101"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2100"/>
+        <location filename="../qt-ui/models.cpp" line="2106"/>
         <source>Dive #%1 - %2</source>
         <translation>Tauchgang Nr. %1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2103"/>
+        <location filename="../qt-ui/models.cpp" line="2109"/>
         <source>Max depth: %1 %2</source>
         <translation>max Tiefe: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2110"/>
+        <location filename="../qt-ui/models.cpp" line="2116"/>
         <source>Duration: %1 min</source>
         <translation>Dauer: %1 Minuten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2115"/>
+        <location filename="../qt-ui/models.cpp" line="2121"/>
         <source>Gas used:</source>
         <translation>Verw. Gas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2117"/>
+        <location filename="../qt-ui/models.cpp" line="2123"/>
         <source>Tags:</source>
         <translation>Stichwörter:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2119"/>
+        <location filename="../qt-ui/models.cpp" line="2125"/>
         <source>SAC:</source>
         <translation>AMV:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2121"/>
+        <location filename="../qt-ui/models.cpp" line="2127"/>
         <source>Weights:</source>
         <translation>Blei:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2126"/>
+        <location filename="../qt-ui/models.cpp" line="2132"/>
         <source>Notes:</source>
         <translation>Notizen:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2133"/>
+        <location filename="../qt-ui/models.cpp" line="2139"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2135"/>
+        <location filename="../qt-ui/models.cpp" line="2141"/>
         <source>Buddy:</source>
         <translation>Tauchpartner:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2137"/>
+        <location filename="../qt-ui/models.cpp" line="2143"/>
         <source>Suit:</source>
         <translation>Anzug:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2139"/>
+        <location filename="../qt-ui/models.cpp" line="2145"/>
         <source>Viz:</source>
         <translation>Sicht:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2141"/>
+        <location filename="../qt-ui/models.cpp" line="2147"/>
         <source>Rating:</source>
         <translation>Bewertung:</translation>
     </message>
@@ -4168,103 +4413,108 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="628"/>
         <source> (#%1 of %2)</source>
         <translation> (#%1 von %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="630"/>
+        <source>Unknown dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="647"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>Null-/Auftauchzeitberechnung wegen Zeitüberschreitung abgebrochen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1168"/>
         <source>Make first divecomputer</source>
         <translation>Primärer Tauchcomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Delete this divecomputer</source>
         <translation>Lösche diesen Tauchcomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1184"/>
         <source>Add gas change</source>
         <translation>Gaswechsel setzen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1187"/>
         <source> (Tank %1)</source>
         <translation> (Tank %1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1195"/>
         <source>Add set-point change</source>
         <translation>Set-Point-Wechsel hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1197"/>
         <source>Add bookmark</source>
         <translation>Markierung setzen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
         <source>Remove event</source>
         <translation>Entferne Ereignis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1206"/>
         <source>Hide similar events</source>
         <translation>Ähnliche Ereignisse ausblenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1213"/>
         <source>Edit name</source>
         <translation>Name bearbeiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1242"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1249"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>Druck in Flasche %1 (momentan zu %2 interpoliert)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1264"/>
         <source>Unhide all events</source>
         <translation>Alle Ereignisse einblenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide events</source>
         <translation>Ereignisse ausblenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide all %1 events?</source>
         <translation>Alle %1 Ereignisse ausblenden?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1333"/>
         <source>Remove the selected event?</source>
         <translation>Ausgewähltes Ereignis entfernen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1334"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1424"/>
         <source>Edit name of bookmark</source>
         <translation>Name der Markierung bearbeiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
         <source>Custom name:</source>
         <translation>Benutzerdefinierter Name:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1430"/>
         <source>Name is too long!</source>
         <translation>Der Name ist zu lang!</translation>
     </message>
@@ -4272,102 +4522,102 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>AIR</source>
         <translation>Luft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>OXYGEN</source>
         <translation>SAUERSTOFF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="208"/>
         <source>Remove this point</source>
         <translation>Diesen Punkt entfernen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="57"/>
         <source>Close</source>
         <translation>Schliessen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="42"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="25"/>
         <source>Average</source>
         <translation>Ø</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="45"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="28"/>
         <source>Minimum</source>
         <translation>Min.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="48"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="31"/>
         <source>Maximum</source>
         <translation>Max.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="297"/>
+        <location filename="../qt-ui/globe.cpp" line="296"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>Karte verschieben und mit Doppelklick Tauchplatz markieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="525"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="526"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="550"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="551"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="570"/>
+        <location filename="../qt-ui/models.cpp" line="574"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="571"/>
+        <location filename="../qt-ui/models.cpp" line="575"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="595"/>
+        <location filename="../qt-ui/models.cpp" line="599"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="596"/>
+        <location filename="../qt-ui/models.cpp" line="600"/>
         <source>cuft</source>
         <translation>cft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="513"/>
         <source>Invalid response from server</source>
         <translation>Ungültige Serverantwort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation>%1 anstelle des erwarteten XML Tags &apos;DiveDateReader&apos;.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="567"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation>XML Tag &apos;DiveDates&apos; nicht gefunden.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Ungültige XML Antwort. Zeile %1: %2</translation>
     </message>
@@ -4375,12 +4625,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1450"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1518"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Diese Funktion ist für den ausgewählten Tauchcomputer noch nicht verfügbar.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1442"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Verbindung zum Tauchcomputer konnte nicht hergestellt werden.</translation>
     </message>
@@ -4394,12 +4644,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
-        <location filename="../qt-ui/simplewidgets.cpp" line="151"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="134"/>
         <source>New starting number</source>
         <translation>Neue erste Nummer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="149"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="132"/>
         <source>New number</source>
         <translation>Neue Nummer</translation>
     </message>
@@ -4407,12 +4657,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1575"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1653"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Diese Funktion ist für den ausgewählten Tauchcomputer noch nicht verfügbar.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1579"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1657"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Verbindung zum Tauchcomputer konnte nicht hergestellt werden.</translation>
     </message>
@@ -4491,12 +4741,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Welche/s Datum/Zeit werden im Bild angezeigt?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="276"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="259"/>
         <source>Open image file</source>
         <translation>Öffne Bilddatei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="278"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="261"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Bilddateien (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -4549,10 +4799,9 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <name>SocialNetworkDialog</name>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="282"/>
-        <source>Dive Date: %1 
+        <source>Dive date: %1 
 </source>
-        <translation>Tauchdatum: %1 
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="285"/>
@@ -4575,10 +4824,9 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="290"/>
-        <source>Dive Location: %1 
+        <source>Dive location: %1 
 </source>
-        <translation>Tauchplatz: %1 
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="293"/>
@@ -4612,7 +4860,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <message>
         <location filename="../qt-ui/socialnetworksdialog.ui" line="57"/>
         <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source>
-        <translation type="unfinished"/>
+        <translation>Der Text zur Rechten wird mit dem Tauchgangsprofil auf Facebook gepostet. Der Albumsname ist wird benötigt, um das Profilbild in diesem Album zu posten.</translation>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworksdialog.ui" line="70"/>
@@ -4622,7 +4870,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <message>
         <location filename="../qt-ui/socialnetworksdialog.ui" line="77"/>
         <source>The profile picture will be posted in this album (required)</source>
-        <translation type="unfinished"/>
+        <translation>Das Tauchgangsprofil wird in diesem Album gepustet (Pflichtfeld).</translation>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworksdialog.ui" line="84"/>
@@ -4696,47 +4944,47 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="329"/>
         <source>Webservice</source>
         <translation>Webdienst</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="393"/>
         <source>Connecting...</source>
         <translation>Verbinde...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
         <source>Download finished</source>
         <translation>Herunterladen beendet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Download error: %1</source>
         <translation>Fehler beim Herunterladen: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="436"/>
         <source>Connection error: </source>
         <translation>Verbindungsfehler: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
         <source>Download successful</source>
         <translation>Erfolgreich geladen!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="439"/>
         <source>Invalid user identifier!</source>
         <translation>Ungültige Benutzerkennung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="312"/>
         <source>Enter User ID and click Download</source>
         <translation>Benutzerkennung eingeben und Herunterladen klicken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="442"/>
         <source>Cannot parse response!</source>
         <translation>Verstehe die Antwort nicht!</translation>
     </message>
@@ -4744,7 +4992,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="592"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="575"/>
         <source>Suits: </source>
         <translation>Anzug:</translation>
     </message>
@@ -4752,7 +5000,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="119"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="116"/>
         <source>No suit set</source>
         <translation>Kein Anzug eingetragen</translation>
     </message>
@@ -4769,7 +5017,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="513"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="496"/>
         <source>Tags: </source>
         <translation>Stichwörter: </translation>
     </message>
@@ -4777,7 +5025,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="144"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="141"/>
         <source>Empty tags</source>
         <translation>Leere Tags</translation>
     </message>
@@ -4785,17 +5033,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -4803,7 +5051,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="141"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="131"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
@@ -4811,7 +5059,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1090"/>
+        <location filename="../qt-ui/models.cpp" line="1094"/>
         <source> (%1 shown)</source>
         <translation> (%1 angezeigt)</translation>
     </message>
@@ -4819,72 +5067,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="64"/>
         <source>Check for updates.</source>
         <translation>Neue Version suchen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="66"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface konnte nicht nach neuen Versionen suchen.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="70"/>
         <source>The following error occurred:</source>
         <translation>Fehlermeldung erhalten:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="72"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
         <source>Please check your internet connection.</source>
         <translation>Bitte Überprüfen Sie Ihre Internetverbindung.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="85"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="84"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>Dies ist die neuste Subsurfaceversion.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="88"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>Es gibt eine neue Subsurface-Version.&lt;br/&gt;Klick hier:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; zum Download.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="95"/>
         <source>A new version of Subsurface is available.</source>
         <translation>Es gibt eine neue Version von Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="97"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
         <source>Latest version is %1, please check with your OS vendor for updates.</source>
         <translation>Die aktuellste Version ist %1, bitte den Betriebssystem Hersteller kontaktieren.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="103"/>
         <source>Newest release version is </source>
         <translation>Die letzte freigegebene Version ist </translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="105"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
         <source>The server returned the following information:</source>
         <translation>Der Server hat die folgenden Informationen zurückgegeben:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="121"/>
         <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
-        <translation type="unfinished"/>
+        <translation>Subsurface überprüft alle zwei Wochen, ob eine neue Version zur Verfügung steht. Falls Subsurface dies nicht weiter prüfen soll, bitte &quot;Ablehnen&quot; klicken.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
         <source>Decline</source>
         <translation>Ablehnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="124"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
         <source>Accept</source>
         <translation>Annehmen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="126"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="125"/>
         <source>Automatic check for updates</source>
         <translation>Automatisch nach Aktualisierungen suchen</translation>
     </message>
@@ -4892,13 +5140,13 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UserManual</name>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="55"/>
+        <location filename="../qt-ui/usermanual.cpp" line="54"/>
         <source>User Manual</source>
         <translation>Benutzerhandbuch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="72"/>
-        <location filename="../qt-ui/usermanual.cpp" line="78"/>
+        <location filename="../qt-ui/usermanual.cpp" line="71"/>
+        <location filename="../qt-ui/usermanual.cpp" line="77"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Das Subsurface-Handbuch kann nicht gefunden werden</translation>
     </message>
@@ -4908,7 +5156,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <message>
         <location filename="../qt-ui/usersurvey.ui" line="44"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Wir würden gerne mehr über unsere Benutzer, ihre Vorlieben und ihre Art, das Programm zu verwenden, lernen. Bitte gib uns eine Minute, füll das Formular aus und schick es ans Subsurface-Team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../qt-ui/usersurvey.ui" line="115"/>
@@ -4918,7 +5166,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <message>
         <location filename="../qt-ui/usersurvey.ui" line="128"/>
         <source>Manually entering dives</source>
-        <translation type="unfinished"/>
+        <translation>Manuelle Tauchgangseingabe</translation>
     </message>
     <message>
         <location filename="../qt-ui/usersurvey.ui" line="14"/>
@@ -4953,7 +5201,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <message>
         <location filename="../qt-ui/usersurvey.ui" line="141"/>
         <source>Android companion app</source>
-        <translation type="unfinished"/>
+        <translation>Android Zusatz-App</translation>
     </message>
     <message>
         <location filename="../qt-ui/usersurvey.ui" line="154"/>
@@ -4976,85 +5224,85 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Von wo importieren Sie Daten?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
         <source>
 Operating System: %1</source>
         <translation>
 Betriebssystem: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 Prozessor Architektur: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 Language: %1</source>
         <translation>
 Sprache: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="93"/>
         <source>Should we ask you later?</source>
         <translation>Sollen wir später noch einmal fragen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Don&apos;t ask me again</source>
         <translation>Fragt mich nicht mehr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Ask later</source>
         <translation>Später nochmal fragen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
         <source>Submit user survey.</source>
         <translation>Unfrageergebnis übertragen.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask again?</source>
         <translation>Fragt noch einmal?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="17"/>
         <source>Send</source>
         <translation>Senden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>
 Prozessor Architektur (laut Betriebsystem): %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation>Subsurface konnte die Benutzerumfrage nicht übertragen.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="121"/>
         <source>The following error occurred:</source>
         <translation>Fehlermeldung erhalten:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>Please check your internet connection.</source>
         <translation>Bitte Überprüfen Sie Ihre Internetverbindung.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="131"/>
         <source>Survey successfully submitted.</source>
         <translation>Benutzerumfrage erfolgreich übertragen.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="136"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation>Während der Suche nach einer neuen Version ist ein Fehler aufgetreten.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -5062,12 +5310,12 @@ Prozessor Architektur (laut Betriebsystem): %1</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -5115,12 +5363,12 @@ Prozessor Architektur (laut Betriebsystem): %1</translation>
         <translation>Hochladen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="247"/>
         <source>Operation timed out</source>
         <translation>Die Aktion hat zu lange gedauert</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="268"/>
         <source>Transferring data...</source>
         <translation>Daten werden übertragen...</translation>
     </message>
@@ -5128,17 +5376,17 @@ Prozessor Architektur (laut Betriebsystem): %1</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="496"/>
+        <location filename="../qt-ui/models.cpp" line="500"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Hier klicken entfernt dieses Gewichtssystem.</translation>
     </message>
@@ -5146,19 +5394,19 @@ Prozessor Architektur (laut Betriebsystem): %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1479"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1487"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1497"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1555"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1566"/>
         <source>Failed!</source>
         <translation>Fehlgeschlagen!</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1506"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1576"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Diese Funktion ist für den ausgewählten Tauchcomputer noch nicht verfügbar.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1580"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Verbindung zum Tauchcomputer konnte nicht hergestellt werden.</translation>
     </message>
@@ -5166,79 +5414,79 @@ Prozessor Architektur (laut Betriebsystem): %1</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1841"/>
+        <location filename="../qt-ui/models.cpp" line="1847"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Jahr 
  &gt; Monat / Reise</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1844"/>
+        <location filename="../qt-ui/models.cpp" line="1850"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1847"/>
+        <location filename="../qt-ui/models.cpp" line="1853"/>
         <source>Duration 
  Total</source>
         <translation>Dauer
 Gesamt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1850"/>
+        <location filename="../qt-ui/models.cpp" line="1856"/>
         <source>
 Average</source>
         <translation>
 Ø</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1853"/>
+        <location filename="../qt-ui/models.cpp" line="1859"/>
         <source>
 Shortest</source>
         <translation>
 Kürzester</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1856"/>
+        <location filename="../qt-ui/models.cpp" line="1862"/>
         <source>
 Longest</source>
         <translation>
 Längster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1859"/>
+        <location filename="../qt-ui/models.cpp" line="1865"/>
         <source>Depth (%1)
  Average</source>
         <translation>Tiefe (%1)
  Durchschnitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1862"/>
-        <location filename="../qt-ui/models.cpp" line="1871"/>
-        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>
 Minimum</source>
         <translation>
 Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1865"/>
-        <location filename="../qt-ui/models.cpp" line="1874"/>
-        <location filename="../qt-ui/models.cpp" line="1883"/>
+        <location filename="../qt-ui/models.cpp" line="1871"/>
+        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>
 Maximum</source>
         <translation>
 Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1874"/>
         <source>SAC (%1)
  Average</source>
         <translation>AMV (%1)
  Durchschnitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1883"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -5319,40 +5567,40 @@ Durchschnitt</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1508"/>
+        <location filename="../dive.c" line="1530"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) oder (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="464"/>
+        <location filename="../divelist.c" line="467"/>
         <location filename="../equipment.c" line="81"/>
-        <location filename="../planner.c" line="1060"/>
-        <location filename="../planner.c" line="1063"/>
+        <location filename="../planner.c" line="1081"/>
+        <location filename="../planner.c" line="1084"/>
         <source>air</source>
         <translation>Luft</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="192"/>
+        <location filename="../equipment.c" line="194"/>
         <source>integrated</source>
         <translation>integriert</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="193"/>
+        <location filename="../equipment.c" line="195"/>
         <source>belt</source>
         <translation>Gürtel</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="194"/>
+        <location filename="../equipment.c" line="196"/>
         <source>ankle</source>
         <translation>Fussblei</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="195"/>
+        <location filename="../equipment.c" line="197"/>
         <source>backplate weight</source>
         <translation>Backplate-Gewicht</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="196"/>
+        <location filename="../equipment.c" line="198"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -5360,7 +5608,7 @@ Durchschnitt</translation>
         <location filename="../file.c" line="112"/>
         <location filename="../file.c" line="434"/>
         <location filename="../file.c" line="506"/>
-        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="925"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Fehler beim Lesen von &apos;%s&apos;</translation>
     </message>
@@ -5417,9 +5665,9 @@ Durchschnitt</translation>
         <translation>Kein zugehöriger Tauchcomputer für die Datei &apos;%s&apos; gefunden</translation>
     </message>
     <message>
-        <location filename="../file.c" line="869"/>
-        <location filename="../file.c" line="909"/>
-        <location filename="../file.c" line="1007"/>
+        <location filename="../file.c" line="870"/>
+        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="1016"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>Maximale Anzahl der unterstützten Spalten beim CSV-Import sind %d</translation>
     </message>
@@ -5590,27 +5838,27 @@ Durchschnitt</translation>
         <translation>ungültige Ereignisnummer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="421"/>
+        <location filename="../libdivecomputer.c" line="419"/>
         <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="427"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Error registering the data</source>
         <translation>Fehler beim Registrieren der Daten</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="433"/>
         <source>Error parsing the datetime</source>
         <translation>Fehler beim Lesen des Datums</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Dive %d: %s</source>
         <translation>Tauchgang %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="455"/>
+        <location filename="../libdivecomputer.c" line="454"/>
         <source>Error parsing the divetime</source>
         <translation>Fehler beim Lesen der Dauer</translation>
     </message>
@@ -5620,166 +5868,166 @@ Durchschnitt</translation>
         <translation>Fehler beim Lesen der maximalen Tiefe</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="482"/>
+        <location filename="../libdivecomputer.c" line="483"/>
         <source>Error parsing temperature</source>
         <translation>Fehler beim Lesen der Temperatur</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="501"/>
+        <location filename="../libdivecomputer.c" line="503"/>
         <source>Error parsing the gas mix count</source>
         <translation>Fehler beim Lesen der Gasgemischszahl</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="513"/>
+        <location filename="../libdivecomputer.c" line="515"/>
         <source>Error obtaining water salinity</source>
         <translation>Fehler beim Lesen des Salzgehalts</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="521"/>
+        <location filename="../libdivecomputer.c" line="524"/>
         <source>Error obtaining surface pressure</source>
         <translation>Kein Oberflächendruck erhalten</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="545"/>
+        <location filename="../libdivecomputer.c" line="549"/>
         <source>Error obtaining divemode</source>
         <translation>Fehler beim Auslesen des Modus des Tauchcomputers</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="562"/>
+        <location filename="../libdivecomputer.c" line="569"/>
         <source>Error parsing the gas mix</source>
         <translation>Fehler beim Lesen des Gasgemischs</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="569"/>
+        <location filename="../libdivecomputer.c" line="576"/>
         <source>Error parsing the samples</source>
         <translation>Fehler beim Lesen der Samples</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="706"/>
+        <location filename="../libdivecomputer.c" line="713"/>
         <source>Event: waiting for user action</source>
         <translation>Ereignis: warte auf Benutzeraktion</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="714"/>
+        <location filename="../libdivecomputer.c" line="721"/>
         <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="778"/>
+        <location filename="../libdivecomputer.c" line="785"/>
         <source>Error registering the event handler.</source>
         <translation>Fehler beim Registrieren der Ereignisbehandlung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="783"/>
+        <location filename="../libdivecomputer.c" line="790"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Fehler bei der Registrierung der Abbruchbehandlung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="804"/>
+        <location filename="../libdivecomputer.c" line="811"/>
         <source>Dive data import error</source>
         <translation>Fehler beim Importieren der Tauchgangsdaten</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="843"/>
+        <location filename="../libdivecomputer.c" line="850"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Fehler beim Erzeugen des libdivecomputer Contexts</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="850"/>
+        <location filename="../libdivecomputer.c" line="857"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Fehler beim Öffnen von %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="858"/>
+        <location filename="../libdivecomputer.c" line="865"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Unzureichende Privilegien zum Öffnen von Gerät %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="506"/>
+        <location filename="../parse-xml.c" line="516"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Unverständliche Prozentangabe %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1760"/>
+        <location filename="../parse-xml.c" line="1770"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Fehler beim Lesen von &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1989"/>
-        <location filename="../parse-xml.c" line="2137"/>
+        <location filename="../parse-xml.c" line="1999"/>
+        <location filename="../parse-xml.c" line="2147"/>
         <source>Database query dm4_events failed.
 </source>
         <translation>Datenbankabfrage dm4_events fehlgeschlagen.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1996"/>
-        <location filename="../parse-xml.c" line="2144"/>
+        <location filename="../parse-xml.c" line="2006"/>
+        <location filename="../parse-xml.c" line="2154"/>
         <source>Database query dm4_tags failed.
 </source>
         <translation>Datenbankabfrage dm4_tags fehlgeschlagen.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2318"/>
+        <location filename="../parse-xml.c" line="2328"/>
         <source>Database query shearwater_cylinders failed.
 </source>
         <translation>Datenbankabfrage shearwater_cylinders fehlgeschlagen.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2325"/>
+        <location filename="../parse-xml.c" line="2335"/>
         <source>Database query shearwater_changes failed.
 </source>
         <translation>Datenbankabfrage shearwater_changes fehlgeschlagen.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2332"/>
+        <location filename="../parse-xml.c" line="2342"/>
         <source>Database query shearwater_profile_sample failed.
 </source>
         <translation>Datenbankabfrage shearwater_profile_sample fehlgeschlagen.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2451"/>
+        <location filename="../parse-xml.c" line="2461"/>
         <source>Database query cobalt_cylinders failed.
 </source>
         <translation>Datenbankabfrage cobalt_cylinders fehlgeschlagen.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2458"/>
+        <location filename="../parse-xml.c" line="2468"/>
         <source>Database query cobalt_buddies failed.
 </source>
         <translation>Datenbankabfrage cobalt_buddies fehlgeschlagen.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2465"/>
+        <location filename="../parse-xml.c" line="2475"/>
         <source>Database query cobalt_visibility failed.
 </source>
         <translation>Datenbankabfrage cobalt_visibility fehlgeschlagen.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2472"/>
+        <location filename="../parse-xml.c" line="2482"/>
         <source>Database query cobalt_location failed.
 </source>
         <translation>Datenbankabfrage cobalt_location fehlgeschlagen.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2479"/>
+        <location filename="../parse-xml.c" line="2489"/>
         <source>Database query cobalt_location (site) failed.
 </source>
         <translation>Datenbankabfrage cobalt_location (Seite) fehlgeschlagen.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2486"/>
+        <location filename="../parse-xml.c" line="2496"/>
         <source>Database query cobalt_profile_sample failed.
 </source>
         <translation>Datenbankabfrage cobalt_profile_sample fehlgeschlagen.
@@ -5793,17 +6041,17 @@ Durchschnitt</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2168"/>
-        <location filename="../parse-xml.c" line="2189"/>
-        <location filename="../parse-xml.c" line="2508"/>
-        <location filename="../parse-xml.c" line="2527"/>
+        <location filename="../parse-xml.c" line="2178"/>
+        <location filename="../parse-xml.c" line="2199"/>
+        <location filename="../parse-xml.c" line="2518"/>
+        <location filename="../parse-xml.c" line="2537"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Datenbankabfrage fehlgeschlagen &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2848"/>
+        <location filename="../parse-xml.c" line="2909"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Kann Stylesheet %s nicht öffnen</translation>
     </message>
@@ -5813,161 +6061,167 @@ Durchschnitt</translation>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="820"/>
+        <location filename="../planner.c" line="841"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Kann Gas %s nicht finden</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="356"/>
+        <location filename="../planner.c" line="363"/>
         <source>Too many gas mixes</source>
         <translation>Zu viele Gasgemische</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="540"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation>Dekompressionsrechnung wegen Zeitüberschreitung abgebrochen</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="548"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation>basierend auf GF niedrig = %d und GF hoch = %d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="544"/>
+        <location filename="../planner.c" line="551"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface Tauchplan</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="548"/>
+        <location filename="../planner.c" line="555"/>
         <source>depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="558"/>
         <source>runtime</source>
         <translation>Laufzeit</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="554"/>
+        <location filename="../planner.c" line="561"/>
         <source>duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="557"/>
+        <location filename="../planner.c" line="564"/>
         <source>gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="594"/>
+        <location filename="../planner.c" line="601"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Auf-/Abstieg bis %.*f %s in %d:%02d min - Runtime %d:%02u mit %s (Setpoint = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="602"/>
+        <location filename="../planner.c" line="609"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Aufstieg auf %.*f %s in %d:%02d min - Laufzeit %d:%02u mit %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="615"/>
+        <location filename="../planner.c" line="622"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Auf %.*f %s bleiben für %d:%02d min - Runtime %d:%02u mit %s (Setpoint = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="622"/>
+        <location filename="../planner.c" line="629"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Verbleibe auf %.*f %s für %d:%02d min - Gesamtzeit %d:%02u mit %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="635"/>
+        <location filename="../planner.c" line="642"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="638"/>
-        <location filename="../planner.c" line="642"/>
+        <location filename="../planner.c" line="645"/>
+        <location filename="../planner.c" line="649"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="651"/>
+        <location filename="../planner.c" line="658"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="676"/>
+        <location filename="../planner.c" line="683"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Wechsle Gas auf %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="678"/>
+        <location filename="../planner.c" line="685"/>
         <source>Switch gas to %s</source>
         <translation>Gaswechsel zu %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="697"/>
+        <location filename="../planner.c" line="704"/>
         <source>CNS</source>
         <translation>CND</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="699"/>
+        <location filename="../planner.c" line="706"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="710"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Gasverbrauch (ohne CCR Segmente):</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="705"/>
+        <location filename="../planner.c" line="712"/>
         <source>Gas consumption:</source>
         <translation>Gasverbrauch:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="535"/>
-        <location filename="../planner.c" line="725"/>
-        <location filename="../planner.c" line="730"/>
-        <location filename="../planner.c" line="753"/>
+        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="732"/>
+        <location filename="../planner.c" line="737"/>
+        <location filename="../planner.c" line="762"/>
+        <location filename="../planner.c" line="772"/>
         <source>Warning:</source>
         <translation>Warnung:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="523"/>
+        <location filename="../planner.c" line="530"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
         <translation>HAFTUNGSAUSSCHLUSS / WARNUNG: DIES IST EINE NEUE IMPLEMENTATION DES BÜHLMANN-ALGORITHMUS UND EINES DARAUF BASIERENDEN TAUCHPLANERS, DIE NUR EINGESCHRÄNKT GETESTET WURDE. WIR RATEN DRINGENST, KEINE TAUCHGÄNGE DURCHZUFÜHREN, DIE NUR AUF DEN HIER ERSTELLTEN DATEN BERUHEN.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="726"/>
+        <location filename="../planner.c" line="733"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>Dies ist mehr Gas, als in der Flasche verfügbar ist!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="731"/>
+        <location filename="../planner.c" line="738"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>Keine ausreichende Reserve für Aufstieg unter Wechselatmung!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="733"/>
+        <location filename="../planner.c" line="740"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s %s (%.0f%s/%.0f%s im berechneten Aufstieg)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="735"/>
+        <location filename="../planner.c" line="742"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s im berechneten Aufstiegs) von %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="759"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>hoher pO₂ Wert %.2f auf %d:%02u mit Gas %s in Tiefe %.*f %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="1064"/>
+        <location filename="../planner.c" line="769"/>
+        <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="1085"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1099"/>
+        <location filename="../profile.c" line="1113"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -5976,70 +6230,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1102"/>
+        <location filename="../profile.c" line="1116"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1106"/>
+        <location filename="../profile.c" line="1120"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1112"/>
+        <location filename="../profile.c" line="1126"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1115"/>
+        <location filename="../profile.c" line="1129"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>AMV: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1117"/>
+        <location filename="../profile.c" line="1131"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1119"/>
+        <location filename="../profile.c" line="1133"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1121"/>
+        <location filename="../profile.c" line="1135"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1123"/>
+        <location filename="../profile.c" line="1137"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1140"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1147"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -6048,7 +6302,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1137"/>
+        <location filename="../profile.c" line="1151"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -6057,148 +6311,149 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1149"/>
+        <location filename="../profile.c" line="1163"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Sicherheitsstopp: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1152"/>
+        <location filename="../profile.c" line="1166"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Sicherheitsstopp: unbek. Zeit @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1157"/>
+        <location filename="../profile.c" line="1171"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1174"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deko: unbek. Zeit @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1178"/>
         <source>In deco
 </source>
         <translation>In Deko
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1166"/>
+        <location filename="../profile.c" line="1180"/>
         <source>NDL: %umin
 </source>
         <translation>Nullzeit: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1183"/>
         <source>TTS: %umin
 </source>
         <translation>Gesamtaufstiegszeit: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1172"/>
+        <location filename="../profile.c" line="1186"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1180"/>
+        <location filename="../profile.c" line="1194"/>
         <source>In deco (calc)
 </source>
         <translation>Deko (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1196"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>Nullzeit: %umin (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1185"/>
+        <location filename="../profile.c" line="1199"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>Gesamtaufstiegszeit: %umin (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1188"/>
+        <location filename="../profile.c" line="1202"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Berechneter tiefster Deko-Stopp %.0f %s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1194"/>
+        <location filename="../profile.c" line="1208"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Gewebe %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1214"/>
         <source>heartbeat: %d
 </source>
         <translation>Herzschlag: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1202"/>
+        <location filename="../profile.c" line="1216"/>
         <source>bearing: %d
 </source>
         <translation>Peilung: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1205"/>
+        <location filename="../profile.c" line="1219"/>
         <source>mean depth to here %.1f%s
 </source>
-        <translation type="unfinished"/>
+        <translation>Durchschnittstiefe bus hier %.1f%s
+</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1314"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1304"/>
-        <location filename="../profile.c" line="1308"/>
-        <location filename="../profile.c" line="1312"/>
+        <location filename="../profile.c" line="1318"/>
+        <location filename="../profile.c" line="1322"/>
+        <location filename="../profile.c" line="1326"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sTiefe:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1316"/>
+        <location filename="../profile.c" line="1330"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sTiefe:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1334"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1324"/>
-        <location filename="../profile.c" line="1328"/>
+        <location filename="../profile.c" line="1338"/>
+        <location filename="../profile.c" line="1342"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1335"/>
+        <location filename="../profile.c" line="1349"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sDruck:%d %s</translation>
     </message>
@@ -6329,6 +6584,7 @@ EADD: %d%s
     </message>
     <message>
         <location filename="../dive.c" line="30"/>
+        <location filename="../equipment.c" line="85"/>
         <source>oxygen</source>
         <translation>Sauerstoff</translation>
     </message>
@@ -6383,97 +6639,97 @@ EADD: %d%s
         <translation>(keine Tauchgänge)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sun</source>
         <translation>So</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Mon</source>
         <translation>Mo</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Tue</source>
         <translation>Di</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Wed</source>
         <translation>Mi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Thu</source>
         <translation>Do</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Fri</source>
         <translation>Fr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sat</source>
         <translation>Sa</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Mar</source>
         <translation>Mär</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
@@ -7077,13 +7333,13 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <translation>Planung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
         <source>GF low</source>
         <translation>GF niedrig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>%</source>
         <translation>%</translation>
     </message>
@@ -7093,7 +7349,7 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <translation>GF hoch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="335"/>
         <source>Drop to first depth</source>
         <translation>Direkter Abstieg zur ersten Tiefe</translation>
     </message>
@@ -7103,69 +7359,69 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <translation>Letzter Stopp auf 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
         <source>Plan backgas breaks</source>
         <translation>Plane backgas Pausen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="355"/>
         <source>Gas options</source>
         <translation>Gas Optionen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="376"/>
         <source>Bottom SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="383"/>
         <source>Deco SAC</source>
         <translation>Deko AMV</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="380"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="390"/>
         <source>Bottom pO₂</source>
         <translation>Grund pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="403"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="413"/>
         <source>Deco pO₂</source>
         <translation>Deko pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="449"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="462"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="478"/>
         <source>Dive notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
         <source>Display runtime</source>
         <translation>Zeige runtime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <source>Display segment duration</source>
         <translation>Zeige Segmentdauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="531"/>
         <source>Display transitions in deco</source>
         <translation>Aufstiege in der Deko anzeigen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="538"/>
         <source>Verbatim dive plan</source>
         <translation>Ausführlicher Tauchplan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="387"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="410"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="397"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -7185,17 +7441,17 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <translation>6m bis Oberfläche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="499"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>Zeige runtime (absolute Zeit) der Stopps im Tauchplan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="515"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>Zeige Dauer (relative Zeit) der Stopps im Tauchplan.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>Zeige Aufstiege im Tauchplen oder behandle sie als implizit</translation>
     </message>
diff --git a/translations/subsurface_el_GR.ts b/translations/subsurface_el_GR.ts
index 52de182ee..ed8188c7b 100644
--- a/translations/subsurface_el_GR.ts
+++ b/translations/subsurface_el_GR.ts
@@ -3,12 +3,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="539"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="522"/>
         <source>Person: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="540"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="523"/>
         <source>Searches for buddies and divemasters</source>
         <translation type="unfinished"/>
     </message>
@@ -16,40 +16,188 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="233"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="230"/>
         <source>No buddies</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>ColumnNameProvider</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>GPS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Avg depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="210"/>
+        <location filename="../configuredivecomputer.cpp" line="212"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="226"/>
+        <location filename="../configuredivecomputer.cpp" line="228"/>
         <source>Could not open backup file: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="542"/>
+        <location filename="../configuredivecomputer.cpp" line="552"/>
         <source>Dive computer details read successfully</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="551"/>
+        <location filename="../configuredivecomputer.cpp" line="561"/>
         <source>Setting successfully written to device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="560"/>
+        <location filename="../configuredivecomputer.cpp" line="570"/>
         <source>Device firmware successfully updated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="569"/>
+        <location filename="../configuredivecomputer.cpp" line="579"/>
         <source>Device settings successfully reset</source>
         <translation type="unfinished"/>
     </message>
@@ -847,70 +995,70 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1053"/>
         <source>Backup files (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1037"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1040"/>
         <source>Backup succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1041"/>
         <source>Your settings have been saved to: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1030"/>
         <source>Backup dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1036"/>
         <source>XML backup error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1052"/>
         <source>Restore dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1056"/>
         <source>XML restore error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1057"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1063"/>
         <source>Restore succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1064"/>
         <source>Your settings have been restored successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1074"/>
         <source>Select firmware file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1075"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -968,12 +1116,12 @@
         <translation>Πατώντας εδώ θα διαγραφή αυτή η φιάλη.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="410"/>
         <source>Cylinder cannot be removed</source>
         <translation>Η φιάλη δεν μπορεί να διαγραφεί</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="407"/>
+        <location filename="../qt-ui/models.cpp" line="411"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation type="unfinished"/>
     </message>
@@ -1049,12 +1197,12 @@
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="48"/>
         <source>Remove the selected dive computer?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="49"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
         <translation>Ο Υπολογιστής Κατάδυσης θα αφαιρεθεί.
@@ -1069,22 +1217,22 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Model</source>
         <translation>Μοντέλο</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Device ID</source>
         <translation>ID Συσκευής</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Nickname</source>
         <translation>Όνομα</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -1092,117 +1240,145 @@
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="115"/>
         <source>Bailing out to OC</source>
         <translation>Bailing out σε ανοικτό κύκλωμα</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="117"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>έναρξη</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>λήξη</translation>
     </message>
 </context>
 <context>
+    <name>DiveImportedModel</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="556"/>
+        <source>Date/time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
+        <source>Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>h:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>min</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1242"/>
+        <location filename="../qt-ui/models.cpp" line="1248"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1245"/>
+        <location filename="../qt-ui/models.cpp" line="1251"/>
         <source>Date</source>
         <translation>Ημερομηνία</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1248"/>
+        <location filename="../qt-ui/models.cpp" line="1254"/>
         <source>Rating</source>
         <translation>Βαθμός</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1254"/>
+        <location filename="../qt-ui/models.cpp" line="1260"/>
         <source>Duration</source>
         <translation>Διάρκεια</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1263"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1263"/>
+        <location filename="../qt-ui/models.cpp" line="1269"/>
         <source>Suit</source>
         <translation>Στολή</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1266"/>
+        <location filename="../qt-ui/models.cpp" line="1272"/>
         <source>Cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1269"/>
+        <location filename="../qt-ui/models.cpp" line="1275"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1277"/>
+        <location filename="../qt-ui/models.cpp" line="1283"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1280"/>
+        <location filename="../qt-ui/models.cpp" line="1286"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1283"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>Location</source>
         <translation>Τοποθεσία</translation>
     </message>
@@ -1210,87 +1386,87 @@
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="787"/>
+        <location filename="../qt-ui/divelistview.cpp" line="768"/>
         <source>Expand all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="788"/>
+        <location filename="../qt-ui/divelistview.cpp" line="769"/>
         <source>Collapse all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="789"/>
+        <location filename="../qt-ui/divelistview.cpp" line="770"/>
         <source>Collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="791"/>
+        <location filename="../qt-ui/divelistview.cpp" line="772"/>
         <source>Remove dive(s) from trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="792"/>
+        <location filename="../qt-ui/divelistview.cpp" line="773"/>
         <source>Create new trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="806"/>
+        <location filename="../qt-ui/divelistview.cpp" line="787"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="808"/>
+        <location filename="../qt-ui/divelistview.cpp" line="789"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="812"/>
+        <location filename="../qt-ui/divelistview.cpp" line="793"/>
         <source>Merge trip with trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="813"/>
+        <location filename="../qt-ui/divelistview.cpp" line="794"/>
         <source>Merge trip with trip below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="817"/>
+        <location filename="../qt-ui/divelistview.cpp" line="798"/>
         <source>Delete dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="819"/>
+        <location filename="../qt-ui/divelistview.cpp" line="800"/>
         <source>Mark dive(s) invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="823"/>
+        <location filename="../qt-ui/divelistview.cpp" line="804"/>
         <source>Merge selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="825"/>
+        <location filename="../qt-ui/divelistview.cpp" line="806"/>
         <source>Renumber dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="826"/>
+        <location filename="../qt-ui/divelistview.cpp" line="807"/>
         <source>Shift times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="827"/>
+        <location filename="../qt-ui/divelistview.cpp" line="808"/>
         <source>Load images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Open image files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation type="unfinished"/>
     </message>
@@ -1475,100 +1651,100 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF αρχεία (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="268"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="68"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
         <source>Subsurface native XML format.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
         <source>Write depths of images to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export UDDF file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="267"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
         <source>Export CSV file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="278"/>
         <source>Export world map</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="299"/>
         <source>HTML files (*.html)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="283"/>
         <source>Export Subsurface XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="284"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
         <source>Save image depths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="298"/>
         <source>Export HTML files as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
         <source>Can&apos;t open file %s</source>
         <translation type="unfinished"/>
     </message>
@@ -1581,248 +1757,228 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
-        <source>CSV options</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="281"/>
-        <source>Pre-configured imports</source>
-        <translation>Προρυθμισμένες εισαγωγές</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="122"/>
-        <source>Depth</source>
-        <translation>Βάθος</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="142"/>
-        <source>Stopdepth</source>
-        <translation>Stopdepth</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="162"/>
-        <source>Pressure</source>
-        <translation>Πίεση</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="176"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="466"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
         <source>Time</source>
         <translation>Ώρα</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="183"/>
-        <source>Temp</source>
-        <translation>Θερμοκρασία</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="213"/>
-        <source>NDL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="233"/>
-        <source>TTS</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="253"/>
-        <source>Cns</source>
-        <translation>Cns</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="58"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="789"/>
-        <source>Field separator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="35"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="363"/>
-        <source>Units</source>
-        <translation>Μονάδες Μέτρησης</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="42"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="370"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="97"/>
         <source>Metric</source>
         <translation>Μετρικό</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="47"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="375"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="102"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="169"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="298"/>
-        <source>Manual dives</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="316"/>
-        <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="319"/>
-        <source>Date format</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="332"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="59"/>
         <source>dd.mm.yyyy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="337"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="64"/>
         <source>mm/dd/yyyy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="342"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="69"/>
         <source>yyyy-mm-dd</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="392"/>
-        <source>Dive #</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
+        <source>Drag the tags above to each corresponding column below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="426"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="439"/>
-        <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+        <source>Dive #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="429"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
         <source>Date</source>
         <translation>Ημερομηνία</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="500"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="513"/>
-        <source>Dive duration in seconds or in min:sec format</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="503"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
         <source>Duration</source>
         <translation>Διάρκεια</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="574"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
         <source>GPS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="591"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
         <source>Tags</source>
         <translation>Ετικέτες</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="608"/>
-        <source>Cyl size</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+        <source>He</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="625"/>
-        <source>Air temp</source>
-        <translation>Εξωτερική Θερμοκρασία</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="78"/>
+        <source>Seconds</source>
+        <translation>Δευτερόλεπτα (sec)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
+        <source>Minutes</source>
+        <translation>Λεπτά (min)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="642"/>
-        <source>Start Pressure</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="88"/>
+        <source>Minutes:seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="659"/>
-        <source>Water temp</source>
-        <translation>Θερμοκρασία Νερού</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+        <source>Location</source>
+        <translation>Τοποθεσία</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="676"/>
-        <source>End Press</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+        <source>Max depth</source>
+        <translation>Μέγιστο βάθος</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+        <source>Tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="693"/>
-        <source>O₂</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="710"/>
-        <source>He</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+        <source>Sample time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="742"/>
-        <source>Choose duration format.</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+        <source>Sample depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="745"/>
-        <source>Duration format</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+        <source>Sample temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="758"/>
-        <source>Seconds</source>
-        <translation>Δευτερόλεπτα (sec)</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="763"/>
-        <source>Minutes</source>
-        <translation>Λεπτά (min)</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="768"/>
-        <source>Minutes:seconds</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+        <source>Sample ndl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="540"/>
-        <source>Location</source>
-        <translation>Τοποθεσία</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="409"/>
-        <source>Max depth</source>
-        <translation>Μέγιστο βάθος</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="386"/>
-        <source>Field configuration</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+        <source>Samples pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
         <source>Mean depth</source>
         <translation>Ενδιάμεσο βάθος</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="483"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
         <source>Buddy</source>
         <translation>Ζευγάρι</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="523"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
         <source>Notes</source>
         <translation>Σημειώσεις</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="557"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
         <source>Weight</source>
         <translation>Βάρος</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DivePlanner</name>
@@ -1865,42 +2021,42 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
         <source>unknown</source>
         <translation>άγνωστο</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="691"/>
         <source>Final depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="693"/>
         <source>Run time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="701"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="695"/>
         <source>Duration</source>
         <translation>Διάρκεια</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="703"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
         <source>Used gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="705"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
         <source>CC set point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1044"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1051"/>
         <source>Discard the plan?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1045"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1052"/>
         <source>You are about to discard your plan.</source>
         <translation>Είστε έτοιμοι να απορρίψετε το Πλάνο.</translation>
     </message>
@@ -1908,22 +2064,22 @@
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="257"/>
         <source>Dive planner points</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="261"/>
         <source>Available gases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="284"/>
         <source>Add dive data point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="304"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="293"/>
         <source>Save new</source>
         <translation type="unfinished"/>
     </message>
@@ -1931,92 +2087,112 @@
 <context>
     <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Depth</source>
         <translation>Βάθος</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
         <source>Time</source>
         <translation>Ώρα</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
         <source>Pressure</source>
         <translation>Πίεση</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>Temperature</source>
         <translation>Θερμοκρασία</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
         <source>Color</source>
         <translation>Χρώμα</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
         <source>Pressure S</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
+        <source>Setpoint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
+        <source>Sensor1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
+        <source>Sensor2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
+        <source>Sensor3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
         <source>Ambient pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
-        <source>Heart Beat</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
+        <source>Heart beat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
-        <source>Gradient Factor</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/>
+        <source>Gradient factor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
-        <source>Mean Depth/s</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
+        <source>Mean depth/s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
         <source>Pressure I</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
         <source>User entered</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
         <source>Cylinder index</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
         <source>Ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
@@ -2067,127 +2243,127 @@
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1437"/>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1443"/>
+        <location filename="../qt-ui/models.cpp" line="1489"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1440"/>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1492"/>
         <source>Date</source>
         <translation>Ημερομηνία</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1443"/>
-        <location filename="../qt-ui/models.cpp" line="1489"/>
+        <location filename="../qt-ui/models.cpp" line="1449"/>
+        <location filename="../qt-ui/models.cpp" line="1495"/>
         <source>Rating</source>
         <translation>Βαθμός</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1452"/>
         <source>Depth</source>
         <translation>Βάθος</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1458"/>
         <source>Temp</source>
         <translation>Θερμοκρασία</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1461"/>
         <source>Weight</source>
         <translation>Βάρος</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1458"/>
-        <location filename="../qt-ui/models.cpp" line="1504"/>
+        <location filename="../qt-ui/models.cpp" line="1464"/>
+        <location filename="../qt-ui/models.cpp" line="1510"/>
         <source>Suit</source>
         <translation>Στολή</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1461"/>
-        <location filename="../qt-ui/models.cpp" line="1507"/>
+        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1513"/>
         <source>Cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1464"/>
-        <location filename="../qt-ui/models.cpp" line="1510"/>
+        <location filename="../qt-ui/models.cpp" line="1470"/>
+        <location filename="../qt-ui/models.cpp" line="1516"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1473"/>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1527"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
-        <location filename="../qt-ui/models.cpp" line="1524"/>
+        <location filename="../qt-ui/models.cpp" line="1482"/>
+        <location filename="../qt-ui/models.cpp" line="1530"/>
         <source>Location</source>
         <translation>Τοποθεσία</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1449"/>
-        <location filename="../qt-ui/models.cpp" line="1495"/>
+        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1501"/>
         <source>Duration</source>
         <translation>Διάρκεια</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1498"/>
+        <location filename="../qt-ui/models.cpp" line="1504"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1470"/>
-        <location filename="../qt-ui/models.cpp" line="1518"/>
+        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1524"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -2195,95 +2371,95 @@
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="98"/>
         <source>no dives were selected</source>
         <translation>καμία κατάδυση δεν έχει επιλεγεί</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="117"/>
         <source>failed to create zip file for upload: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="143"/>
         <source>cannot create temporary file: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/>
         <source>internal error: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="169"/>
         <source>internal error</source>
         <translation>εσωτερικό σφάλμα</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="629"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="828"/>
         <source>Done</source>
         <translation>Done</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/>
         <source>Uploading dive list...</source>
         <translation>Μεταφόρτωση λίστας καταδύσεων...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="692"/>
         <source>Downloading dive list...</source>
         <translation>Λήψη λίστας καταδύσεων...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="741"/>
         <source>Downloading %1 dives...</source>
         <translation>Λήψη %1 καταδύσων...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="785"/>
         <source>Download finished - %1</source>
         <translation>Η λήψη τελείωσε - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="802"/>
         <source>Corrupted download</source>
         <translation>Κατεστραμμένη λήψη</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Το αρχείο αυτό δεν μπορούσε να ανοιχθεί:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
         <source>Upload failed</source>
         <translation>Η μεταφόρτωση απέτυχε</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/>
         <source>Upload successful</source>
         <translation>Η μεταφόρτωση πέτυχε</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
         <source>Login failed</source>
         <translation>Login failed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
         <source>Cannot parse response</source>
         <translation>Cannot parse response</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
         <source>Error: %1</source>
         <translation>Σφάλμα: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="829"/>
         <source>Upload finished</source>
         <translation>Η μεταφόρτωση τελείωσε</translation>
     </message>
@@ -2291,54 +2467,52 @@
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
-        <source>OK</source>
-        <translation>ΟΚ</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="169"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="400"/>
         <source>Retry</source>
         <translation>Επανάληψη</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="264"/>
         <source>Find Uemis dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Επιλέξτε το αρχείο για το logfile της λήψης από τον υπολογιστή κατάδυσης</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Log files (*.log)</source>
         <translation>Log files (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="362"/>
         <source>Warning</source>
         <translation>Προειδοποίηση</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="363"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>Saving the libdivecomputer dump will NOT download dives to the dive list.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="374"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Επιλέξτε αρχείο για το binary dump file του υπολογιστή κατάδυσης</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="375"/>
         <source>Dump files (*.bin)</source>
         <translation>Dump files (*.bin)</translation>
     </message>
@@ -2346,7 +2520,7 @@
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="101"/>
         <source>Vendor</source>
         <translation>Κατασκευαστής</translation>
     </message>
@@ -2356,54 +2530,74 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="31"/>
         <source>Device or mount point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="111"/>
         <source>Dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="132"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="45"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="80"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="94"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="52"/>
         <source>Force download of all dives</source>
         <translation>Λήψη όλων των καταδύσεων</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
         <source>Always prefer downloaded dives</source>
         <translation>Προτίμηση των ληφθέντων καταδύσεων</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
         <source>OK</source>
         <translation>ΟΚ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="189"/>
         <source>Cancel</source>
         <translation>Ακύρωση</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/>
+        <source>Downloaded Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
+        <source>Select all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
+        <source>Unselect all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
         <source>Save libdivecomputer logfile</source>
         <translation>Save libdivecomputer logfile</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="87"/>
         <source>Save libdivecomputer dumpfile</source>
         <translation>Save libdivecomputer dumpfile</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
         <source>Download into new trip</source>
         <translation type="unfinished"/>
     </message>
@@ -2411,12 +2605,12 @@
 <context>
     <name>ExtraDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Value</source>
         <translation type="unfinished"/>
     </message>
@@ -2430,21 +2624,21 @@
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="245"/>
-        <source>Your dive profile was updated to facebook.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
-        <source>Photo Upload Failed</source>
+        <source>Your dive profile was updated to Facebook.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="250"/>
-        <source>Your dive profile was not updated to facebook, 
+        <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+        <source>Photo Upload Failed</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>FilterWidget</name>
@@ -2485,17 +2679,17 @@
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1544"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1621"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1624"/>
         <source>Firmware update failed!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1550"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1627"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -2503,7 +2697,7 @@
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="128"/>
+        <location filename="../qt-ui/globe.cpp" line="119"/>
         <source>Edit selected dive locations</source>
         <translation type="unfinished"/>
     </message>
@@ -2511,7 +2705,7 @@
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="566"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="549"/>
         <source>Location: </source>
         <translation type="unfinished"/>
     </message>
@@ -2519,7 +2713,7 @@
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="286"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="283"/>
         <source>No location set</source>
         <translation type="unfinished"/>
     </message>
@@ -2527,347 +2721,352 @@
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="133"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
+        <location filename="../qt-ui/maintab.cpp" line="497"/>
         <source>Location</source>
         <translation>Τοποθεσία</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="67"/>
         <source>Coordinates</source>
         <translation>Συντεταγμένες</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="169"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="154"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Buddy</source>
         <translation>Ζευγάρι</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="222"/>
+        <location filename="../qt-ui/maintab.ui" line="277"/>
         <source>Tags</source>
         <translation>Ετικέτες</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="186"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
         <source>Rating</source>
         <translation>Βαθμός</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="221"/>
         <source>Visibility</source>
         <translation>Ορατότητα</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="230"/>
         <source>Suit</source>
         <translation>Στολή</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="465"/>
+        <location filename="../qt-ui/maintab.cpp" line="470"/>
         <source>Dive notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
-        <location filename="../qt-ui/maintab.ui" line="648"/>
-        <location filename="../qt-ui/maintab.cpp" line="277"/>
+        <location filename="../qt-ui/maintab.ui" line="74"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="102"/>
+        <location filename="../qt-ui/maintab.ui" line="677"/>
+        <location filename="../qt-ui/maintab.cpp" line="279"/>
         <source>Air temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <location filename="../qt-ui/maintab.ui" line="667"/>
-        <location filename="../qt-ui/maintab.cpp" line="278"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.ui" line="696"/>
+        <location filename="../qt-ui/maintab.cpp" line="280"/>
         <source>Water temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="229"/>
-        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.ui" line="284"/>
+        <location filename="../qt-ui/maintab.cpp" line="498"/>
         <source>Notes</source>
         <translation>Σημειώσεις</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="369"/>
+        <location filename="../qt-ui/maintab.ui" line="398"/>
         <source>Equipment</source>
         <translation>Εξοπλισμός</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="496"/>
+        <location filename="../qt-ui/maintab.ui" line="525"/>
         <source>Gases used</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="515"/>
+        <location filename="../qt-ui/maintab.ui" line="544"/>
         <source>Gas consumed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="553"/>
+        <location filename="../qt-ui/maintab.ui" line="582"/>
         <source>CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="591"/>
+        <location filename="../qt-ui/maintab.ui" line="620"/>
         <source>Max. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="629"/>
+        <location filename="../qt-ui/maintab.ui" line="658"/>
         <source>Air pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="686"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>Dive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="845"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
         <source>Total time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="903"/>
+        <location filename="../qt-ui/maintab.ui" line="932"/>
         <source>Gas consumption</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="962"/>
+        <location filename="../qt-ui/maintab.ui" line="991"/>
         <source>Extra data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="968"/>
+        <location filename="../qt-ui/maintab.ui" line="997"/>
         <source>Additional data from dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="54"/>
-        <location filename="../qt-ui/maintab.ui" line="458"/>
+        <location filename="../qt-ui/maintab.ui" line="83"/>
+        <location filename="../qt-ui/maintab.ui" line="487"/>
         <source>Date</source>
         <translation>Ημερομηνία</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="61"/>
+        <location filename="../qt-ui/maintab.ui" line="90"/>
         <source>Time</source>
         <translation>Ώρα</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="425"/>
+        <location filename="../qt-ui/maintab.ui" line="454"/>
         <source>Dive info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="477"/>
+        <location filename="../qt-ui/maintab.ui" line="506"/>
         <source>Interval</source>
         <translation>Διάλειμμα</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="534"/>
-        <location filename="../qt-ui/maintab.ui" line="799"/>
+        <location filename="../qt-ui/maintab.ui" line="563"/>
+        <location filename="../qt-ui/maintab.ui" line="828"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="610"/>
+        <location filename="../qt-ui/maintab.ui" line="639"/>
         <source>Avg. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="572"/>
+        <location filename="../qt-ui/maintab.ui" line="601"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="734"/>
         <source>Salinity</source>
         <translation>Αλμυρότητα</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="742"/>
+        <location filename="../qt-ui/maintab.ui" line="771"/>
         <source>Stats</source>
         <translation>Στατιστικά</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="775"/>
+        <location filename="../qt-ui/maintab.ui" line="804"/>
         <source>Depth</source>
         <translation>Βάθος</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="787"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Temperature</source>
         <translation>Θερμοκρασία</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="813"/>
+        <location filename="../qt-ui/maintab.ui" line="842"/>
         <source>Duration</source>
         <translation>Διάρκεια</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="864"/>
+        <location filename="../qt-ui/maintab.ui" line="893"/>
         <source>Dives</source>
         <translation>Καταδύσεις</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="948"/>
+        <location filename="../qt-ui/maintab.ui" line="977"/>
         <source>Photos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="95"/>
+        <location filename="../qt-ui/maintab.cpp" line="87"/>
         <source>Cylinders</source>
         <translation>Φιάλες</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="99"/>
+        <location filename="../qt-ui/maintab.cpp" line="91"/>
         <source>Weights</source>
         <translation>Βάρη</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="55"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Apply changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="59"/>
+        <location filename="../qt-ui/maintab.cpp" line="50"/>
         <source>Discard changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="96"/>
+        <location filename="../qt-ui/maintab.cpp" line="88"/>
         <source>Add cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="100"/>
+        <location filename="../qt-ui/maintab.cpp" line="92"/>
         <source>Add weight system</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="274"/>
+        <location filename="../qt-ui/maintab.cpp" line="276"/>
         <source>Air temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="275"/>
+        <location filename="../qt-ui/maintab.cpp" line="277"/>
         <source>Water temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="312"/>
+        <location filename="../qt-ui/maintab.cpp" line="314"/>
         <source>This trip is being edited.</source>
         <translation>Το ταξίδι αυτό επεξεργάζεται αυτή τη στιγμή.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="320"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Multiple dives are being edited.</source>
         <translation>Πολλαπλές καταδύσεις επεξεργάζονται αυτή τη στιγμή.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.cpp" line="324"/>
         <source>This dive is being edited.</source>
         <translation>Η κατάδυση επεξεργάζεται αυτή τη στιγμή.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="436"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
+        <location filename="../qt-ui/maintab.cpp" line="465"/>
         <source>Trip notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="458"/>
+        <location filename="../qt-ui/maintab.cpp" line="463"/>
         <source>Trip location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="526"/>
-        <location filename="../qt-ui/maintab.cpp" line="558"/>
-        <location filename="../qt-ui/maintab.cpp" line="562"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
         <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="574"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="555"/>
+        <location filename="../qt-ui/maintab.cpp" line="563"/>
         <source>Deepest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="556"/>
+        <location filename="../qt-ui/maintab.cpp" line="564"/>
         <source>Shallowest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="569"/>
+        <location filename="../qt-ui/maintab.cpp" line="577"/>
         <source>Highest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="578"/>
         <source>Lowest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="571"/>
+        <location filename="../qt-ui/maintab.cpp" line="579"/>
         <source>Average total SAC of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="582"/>
+        <location filename="../qt-ui/maintab.cpp" line="590"/>
         <source>Highest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="583"/>
+        <location filename="../qt-ui/maintab.cpp" line="591"/>
         <source>Lowest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="584"/>
+        <location filename="../qt-ui/maintab.cpp" line="592"/>
         <source>Average temperature of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="594"/>
+        <location filename="../qt-ui/maintab.cpp" line="602"/>
         <source>Longest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="595"/>
+        <location filename="../qt-ui/maintab.cpp" line="603"/>
         <source>Shortest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="596"/>
+        <location filename="../qt-ui/maintab.cpp" line="604"/>
         <source>Average length of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="620"/>
+        <location filename="../qt-ui/maintab.cpp" line="628"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="624"/>
+        <location filename="../qt-ui/maintab.cpp" line="632"/>
         <source> and </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="911"/>
+        <location filename="../qt-ui/maintab.cpp" line="925"/>
         <source>Discard the changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="912"/>
+        <location filename="../qt-ui/maintab.cpp" line="926"/>
         <source>You are about to discard your changes.</source>
         <translation type="unfinished"/>
     </message>
@@ -3010,7 +3209,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="296"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="232"/>
         <source>Open</source>
         <translation>Άνοιγμα</translation>
     </message>
@@ -3370,90 +3569,90 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="252"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="229"/>
         <source>Open file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="256"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="233"/>
         <source>Cancel</source>
         <translation>Ακύρωση</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="332"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="309"/>
         <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="444"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
         <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="491"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
         <source>Print runtime table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="834"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="811"/>
         <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="836"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="813"/>
         <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="841"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="818"/>
         <source>Save changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1196"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1173"/>
         <source>Save file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1337"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1314"/>
         <source>Open dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="819"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Οι αλλαγές θα χαθούν αν δεν τις αποθηκεύσετε.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="300"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="444"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="277"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Warning</source>
         <translation>Προειδοποίηση</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1180"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1157"/>
         <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="625"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="602"/>
         <source>Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1197"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1174"/>
         <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="1338"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1315"/>
         <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"/>
     </message>
@@ -3461,7 +3660,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="651"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="634"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation type="unfinished"/>
     </message>
@@ -3469,39 +3668,39 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="239"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="243"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="244"/>
         <source>Not now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="245"/>
         <source>Update firmware</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
         <source>Firmware upgrade notice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
         <source>Save the downloaded firmware as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
         <source>HEX files (*.hex)</source>
         <translation type="unfinished"/>
     </message>
@@ -3509,54 +3708,69 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Open circuit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>ft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="481"/>
         <source>Last stop at 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="482"/>
         <source>50% avg. depth to 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="489"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
         <source>20ft to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="485"/>
         <source>m/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
         <source>Last stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
         <source>50% avg. depth to 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="494"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
         <source>6m to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="497"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="498"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
         <source>cuft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="506"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="507"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="500"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="501"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
@@ -3675,6 +3889,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="816"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -3709,57 +3924,87 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="795"/>
+        <source>CCR: Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="809"/>
+        <source>Default CCR set-point for dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="832"/>
+        <source>pSCR O₂ metabolism rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="839"/>
+        <source>pSCR ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="846"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="859"/>
+        <source>1:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="875"/>
         <source>System default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="843"/>
+        <location filename="../qt-ui/preferences.ui" line="914"/>
         <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="849"/>
+        <location filename="../qt-ui/preferences.ui" line="920"/>
         <source>Proxy type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="862"/>
+        <location filename="../qt-ui/preferences.ui" line="933"/>
         <source>Host</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="888"/>
+        <location filename="../qt-ui/preferences.ui" line="959"/>
         <source>Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="914"/>
+        <location filename="../qt-ui/preferences.ui" line="985"/>
         <source>Requires authentication</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="934"/>
+        <location filename="../qt-ui/preferences.ui" line="1005"/>
         <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="957"/>
+        <location filename="../qt-ui/preferences.ui" line="1028"/>
         <source>Password</source>
         <translation>Κωδικός</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="985"/>
-        <source>about:blank</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="1011"/>
-        <source>Disconnect from facebook</source>
+        <location filename="../qt-ui/preferences.ui" line="1079"/>
+        <source>Disconnect from Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="824"/>
+        <location filename="../qt-ui/preferences.ui" line="895"/>
         <source>Filter</source>
         <translation>Φίλτρο</translation>
     </message>
@@ -3914,52 +4159,52 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="28"/>
+        <location filename="../qt-ui/preferences.cpp" line="44"/>
         <source>No proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="29"/>
+        <location filename="../qt-ui/preferences.cpp" line="45"/>
         <source>System proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="30"/>
+        <location filename="../qt-ui/preferences.cpp" line="46"/>
         <source>HTTP proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="31"/>
+        <location filename="../qt-ui/preferences.cpp" line="47"/>
         <source>SOCKS proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="291"/>
+        <location filename="../qt-ui/preferences.cpp" line="324"/>
         <source>Restart required</source>
         <translation>Απαιτείται επανεκκίνηση</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="292"/>
+        <location filename="../qt-ui/preferences.cpp" line="325"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>Για να φορτώσε σωστά μια γλώσσα πρέπει να επανεκκινήσεσε το Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="456"/>
+        <location filename="../qt-ui/preferences.cpp" line="494"/>
         <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Open default log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="455"/>
+        <location filename="../qt-ui/preferences.cpp" line="493"/>
         <source>Warning</source>
         <translation>Προειδοποίηση</translation>
     </message>
@@ -3967,17 +4212,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="91"/>
+        <location filename="../qt-ui/printdialog.cpp" line="85"/>
         <source>&amp;Preview</source>
         <translation>&amp;Προεπισκόπηση</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="88"/>
+        <location filename="../qt-ui/printdialog.cpp" line="82"/>
         <source>P&amp;rint</source>
         <translation>Εκτύ&amp;πωση</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="103"/>
+        <location filename="../qt-ui/printdialog.cpp" line="97"/>
         <source>Print</source>
         <translation>Εκτύπωση</translation>
     </message>
@@ -3985,42 +4230,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="20"/>
         <source>Dive#</source>
         <translation>Κατάδυση#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="21"/>
         <source>Date</source>
         <translation>Ημερομηνία</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="22"/>
         <source>Depth</source>
         <translation>Βάθος</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="23"/>
         <source>Duration</source>
         <translation>Διάρκεια</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Master</source>
         <translation>Master</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Buddy</source>
         <translation>Ζευγάρι</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="34"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Location</source>
         <translation>Τοποθεσία</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <location filename="../qt-ui/printlayout.cpp" line="63"/>
         <source>Subsurface cannot find a usable printer on this system!</source>
         <translation type="unfinished"/>
     </message>
@@ -4086,72 +4331,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2095"/>
+        <location filename="../qt-ui/models.cpp" line="2101"/>
         <source>unknown</source>
         <translation>άγνωστο</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2100"/>
+        <location filename="../qt-ui/models.cpp" line="2106"/>
         <source>Dive #%1 - %2</source>
         <translation>Κατάδυση #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2103"/>
+        <location filename="../qt-ui/models.cpp" line="2109"/>
         <source>Max depth: %1 %2</source>
         <translation>Μέγιστο Βάθος: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2110"/>
+        <location filename="../qt-ui/models.cpp" line="2116"/>
         <source>Duration: %1 min</source>
         <translation>Διάρκεια: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2115"/>
+        <location filename="../qt-ui/models.cpp" line="2121"/>
         <source>Gas used:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2117"/>
+        <location filename="../qt-ui/models.cpp" line="2123"/>
         <source>Tags:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2119"/>
+        <location filename="../qt-ui/models.cpp" line="2125"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2121"/>
+        <location filename="../qt-ui/models.cpp" line="2127"/>
         <source>Weights:</source>
         <translation>Βάρη:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2126"/>
+        <location filename="../qt-ui/models.cpp" line="2132"/>
         <source>Notes:</source>
         <translation>Σημειώσεις:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2133"/>
+        <location filename="../qt-ui/models.cpp" line="2139"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2135"/>
+        <location filename="../qt-ui/models.cpp" line="2141"/>
         <source>Buddy:</source>
         <translation>Ζευγάρι:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2137"/>
+        <location filename="../qt-ui/models.cpp" line="2143"/>
         <source>Suit:</source>
         <translation>Στολή:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2139"/>
+        <location filename="../qt-ui/models.cpp" line="2145"/>
         <source>Viz:</source>
         <translation>Ορατότητα:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2141"/>
+        <location filename="../qt-ui/models.cpp" line="2147"/>
         <source>Rating:</source>
         <translation>Βαθμός:</translation>
     </message>
@@ -4159,103 +4404,108 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="628"/>
         <source> (#%1 of %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="630"/>
+        <source>Unknown dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="647"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1168"/>
         <source>Make first divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Delete this divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1184"/>
         <source>Add gas change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1187"/>
         <source> (Tank %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1195"/>
         <source>Add set-point change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1197"/>
         <source>Add bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
         <source>Remove event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1206"/>
         <source>Hide similar events</source>
         <translation>Απόκρυψη παρόμοιων συμβάντων</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1213"/>
         <source>Edit name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1242"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1249"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1264"/>
         <source>Unhide all events</source>
         <translation>Απόκρυψη όλων των συμβάντων</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide events</source>
         <translation>Απόκρυψη όλων των συμβάντων</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide all %1 events?</source>
         <translation>Απόκρυψη όλων των %1 συμβάντων;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1333"/>
         <source>Remove the selected event?</source>
         <translation>Διαγραφή του επιλεγμένου συμβάντος;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1334"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1424"/>
         <source>Edit name of bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
         <source>Custom name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1430"/>
         <source>Name is too long!</source>
         <translation type="unfinished"/>
     </message>
@@ -4263,102 +4513,102 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>AIR</source>
         <translation>ΑΕΡΑΣ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>OXYGEN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="208"/>
         <source>Remove this point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="57"/>
         <source>Close</source>
         <translation>Κλείσιμο</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="42"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="25"/>
         <source>Average</source>
         <translation>Μέσος όρος</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="45"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="28"/>
         <source>Minimum</source>
         <translation>Ελάχιστο</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="48"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="31"/>
         <source>Maximum</source>
         <translation>Μέγιστο</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="297"/>
+        <location filename="../qt-ui/globe.cpp" line="296"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>Μετακινήστε τον χάρτη και με διπλό κλικ ορίστε την τοποθεσία κατάδυσης</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="525"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="526"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="550"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="551"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="570"/>
+        <location filename="../qt-ui/models.cpp" line="574"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="571"/>
+        <location filename="../qt-ui/models.cpp" line="575"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="595"/>
+        <location filename="../qt-ui/models.cpp" line="599"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="596"/>
+        <location filename="../qt-ui/models.cpp" line="600"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="513"/>
         <source>Invalid response from server</source>
         <translation>Άκυρη απάντηση από τον σέρβερ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="567"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation>Expected XML tag &apos;DiveDates&apos; not found</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Malformed XML response. Line %1: %2</translation>
     </message>
@@ -4366,12 +4616,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1450"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1518"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1442"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -4385,12 +4635,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
-        <location filename="../qt-ui/simplewidgets.cpp" line="151"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="134"/>
         <source>New starting number</source>
         <translation>Νέος αρχικός αριθμός</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="149"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="132"/>
         <source>New number</source>
         <translation type="unfinished"/>
     </message>
@@ -4398,12 +4648,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1575"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1653"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1579"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1657"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -4482,12 +4732,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="276"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="259"/>
         <source>Open image file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="278"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="261"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation type="unfinished"/>
     </message>
@@ -4540,7 +4790,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <name>SocialNetworkDialog</name>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="282"/>
-        <source>Dive Date: %1 
+        <source>Dive date: %1 
 </source>
         <translation type="unfinished"/>
     </message>
@@ -4564,7 +4814,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="290"/>
-        <source>Dive Location: %1 
+        <source>Dive location: %1 
 </source>
         <translation type="unfinished"/>
     </message>
@@ -4681,47 +4931,47 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="329"/>
         <source>Webservice</source>
         <translation>Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="393"/>
         <source>Connecting...</source>
         <translation>Σύνδεση...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
         <source>Download finished</source>
         <translation>Η λήψη τελείωσε</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Download error: %1</source>
         <translation>Σφάλμα λήψης: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="436"/>
         <source>Connection error: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
         <source>Download successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="439"/>
         <source>Invalid user identifier!</source>
         <translation>Άκυρος έλεγχος χρήστη!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="312"/>
         <source>Enter User ID and click Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="442"/>
         <source>Cannot parse response!</source>
         <translation>Cannot parse response!</translation>
     </message>
@@ -4729,7 +4979,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="592"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="575"/>
         <source>Suits: </source>
         <translation type="unfinished"/>
     </message>
@@ -4737,7 +4987,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="119"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="116"/>
         <source>No suit set</source>
         <translation type="unfinished"/>
     </message>
@@ -4754,7 +5004,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="513"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="496"/>
         <source>Tags: </source>
         <translation type="unfinished"/>
     </message>
@@ -4762,7 +5012,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="144"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="141"/>
         <source>Empty tags</source>
         <translation type="unfinished"/>
     </message>
@@ -4770,17 +5020,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>Description</source>
         <translation>Περιγραφή</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -4788,7 +5038,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="141"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="131"/>
         <source>Information</source>
         <translation>Πληροφορίες</translation>
     </message>
@@ -4796,7 +5046,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1090"/>
+        <location filename="../qt-ui/models.cpp" line="1094"/>
         <source> (%1 shown)</source>
         <translation type="unfinished"/>
     </message>
@@ -4804,72 +5054,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="64"/>
         <source>Check for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="66"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="70"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="72"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
         <source>Please check your internet connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="85"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="84"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="88"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="95"/>
         <source>A new version of Subsurface is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="97"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
         <source>Latest version is %1, please check with your OS vendor for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="103"/>
         <source>Newest release version is </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="105"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
         <source>The server returned the following information:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="121"/>
         <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
         <source>Decline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="124"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
         <source>Accept</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="126"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="125"/>
         <source>Automatic check for updates</source>
         <translation type="unfinished"/>
     </message>
@@ -4877,13 +5127,13 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UserManual</name>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="55"/>
+        <location filename="../qt-ui/usermanual.cpp" line="54"/>
         <source>User Manual</source>
         <translation>Εγχειρίδιο Χρήσης</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="72"/>
-        <location filename="../qt-ui/usermanual.cpp" line="78"/>
+        <location filename="../qt-ui/usermanual.cpp" line="71"/>
+        <location filename="../qt-ui/usermanual.cpp" line="77"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Δεν βρέθηκε το εγχειρίδιο χρήσης</translation>
     </message>
@@ -4961,81 +5211,81 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
         <source>
 Operating System: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
         <source>
 CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 Language: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="93"/>
         <source>Should we ask you later?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Don&apos;t ask me again</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Ask later</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
         <source>Submit user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask again?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="17"/>
         <source>Send</source>
         <translation>Αποστολή</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="121"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>Please check your internet connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="131"/>
         <source>Survey successfully submitted.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="136"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation type="unfinished"/>
     </message>
@@ -5043,12 +5293,12 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>Description</source>
         <translation>Περιγραφή</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -5096,12 +5346,12 @@ OS CPU Architecture: %1</source>
         <translation>Μεταφόρτωση</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="247"/>
         <source>Operation timed out</source>
         <translation>Operation timed out</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="268"/>
         <source>Transferring data...</source>
         <translation type="unfinished"/>
     </message>
@@ -5109,17 +5359,17 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Type</source>
         <translation>Τύπος</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Weight</source>
         <translation>Βάρος</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="496"/>
+        <location filename="../qt-ui/models.cpp" line="500"/>
         <source>Clicking here will remove this weight system.</source>
         <translation type="unfinished"/>
     </message>
@@ -5127,19 +5377,19 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1479"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1487"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1497"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1555"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1566"/>
         <source>Failed!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1506"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1576"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1580"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -5147,79 +5397,79 @@ OS CPU Architecture: %1</source>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1841"/>
+        <location filename="../qt-ui/models.cpp" line="1847"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Έτος
 &gt; Μήνας / Ταξίδι</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1844"/>
+        <location filename="../qt-ui/models.cpp" line="1850"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1847"/>
+        <location filename="../qt-ui/models.cpp" line="1853"/>
         <source>Duration 
  Total</source>
         <translation>Συνολική
 Διάρκεια</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1850"/>
+        <location filename="../qt-ui/models.cpp" line="1856"/>
         <source>
 Average</source>
         <translation>
 Μέσος Όρος</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1853"/>
+        <location filename="../qt-ui/models.cpp" line="1859"/>
         <source>
 Shortest</source>
         <translation>
 Συντομότερο</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1856"/>
+        <location filename="../qt-ui/models.cpp" line="1862"/>
         <source>
 Longest</source>
         <translation>
 Μακρύτερο</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1859"/>
+        <location filename="../qt-ui/models.cpp" line="1865"/>
         <source>Depth (%1)
  Average</source>
         <translation>Μέσο
 Βάθος (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1862"/>
-        <location filename="../qt-ui/models.cpp" line="1871"/>
-        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>
 Minimum</source>
         <translation>
 Ελάχιστο</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1865"/>
-        <location filename="../qt-ui/models.cpp" line="1874"/>
-        <location filename="../qt-ui/models.cpp" line="1883"/>
+        <location filename="../qt-ui/models.cpp" line="1871"/>
+        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>
 Maximum</source>
         <translation>
 Μέγιστο</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1874"/>
         <source>SAC (%1)
  Average</source>
         <translation>Μέσο
 SAC (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1883"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Μέση
@@ -5300,40 +5550,40 @@ SAC (%1)</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1508"/>
+        <location filename="../dive.c" line="1530"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) ή (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="464"/>
+        <location filename="../divelist.c" line="467"/>
         <location filename="../equipment.c" line="81"/>
-        <location filename="../planner.c" line="1060"/>
-        <location filename="../planner.c" line="1063"/>
+        <location filename="../planner.c" line="1081"/>
+        <location filename="../planner.c" line="1084"/>
         <source>air</source>
         <translation>αέρας</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="192"/>
+        <location filename="../equipment.c" line="194"/>
         <source>integrated</source>
         <translation>ενσωματωμένα</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="193"/>
+        <location filename="../equipment.c" line="195"/>
         <source>belt</source>
         <translation>ζώνη</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="194"/>
+        <location filename="../equipment.c" line="196"/>
         <source>ankle</source>
         <translation>αστραγάλου</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="195"/>
+        <location filename="../equipment.c" line="197"/>
         <source>backplate weight</source>
         <translation>βάρος backplate</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="196"/>
+        <location filename="../equipment.c" line="198"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -5341,7 +5591,7 @@ SAC (%1)</translation>
         <location filename="../file.c" line="112"/>
         <location filename="../file.c" line="434"/>
         <location filename="../file.c" line="506"/>
-        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="925"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Αποτυχία ανάγνωσης &apos;%s&apos;</translation>
     </message>
@@ -5398,9 +5648,9 @@ SAC (%1)</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../file.c" line="869"/>
-        <location filename="../file.c" line="909"/>
-        <location filename="../file.c" line="1007"/>
+        <location filename="../file.c" line="870"/>
+        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="1016"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>Μέγιστο αριθμός υποστηριζόμενων στηλών στην εισαγωγή CSV είναι %d</translation>
     </message>
@@ -5571,27 +5821,27 @@ SAC (%1)</translation>
         <translation>άκυρος αριθμός συμβάντος</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="421"/>
+        <location filename="../libdivecomputer.c" line="419"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Αδύνατον να αναλυθεί το %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="427"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Error registering the data</source>
         <translation>Σφάλμα στην καταχώρηση των δεδομένων</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="433"/>
         <source>Error parsing the datetime</source>
         <translation>Σφάλμα στην ημερομηνία</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Dive %d: %s</source>
         <translation>Κατάδυση %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="455"/>
+        <location filename="../libdivecomputer.c" line="454"/>
         <source>Error parsing the divetime</source>
         <translation>Σφάλμα στην διάρκεια της κατάδυσης</translation>
     </message>
@@ -5601,156 +5851,156 @@ SAC (%1)</translation>
         <translation>Σφάλμα στο μέγιστο βάθος</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="482"/>
+        <location filename="../libdivecomputer.c" line="483"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="501"/>
+        <location filename="../libdivecomputer.c" line="503"/>
         <source>Error parsing the gas mix count</source>
         <translation>Σφάλμα στον αριθμό των αερίων</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="513"/>
+        <location filename="../libdivecomputer.c" line="515"/>
         <source>Error obtaining water salinity</source>
         <translation>Σφάλμα στην απόκτηση της αλμυρότητας</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="521"/>
+        <location filename="../libdivecomputer.c" line="524"/>
         <source>Error obtaining surface pressure</source>
         <translation>Σφάλμα στην απόκτηση της ατμοσφαιρικής πίεσης</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="545"/>
+        <location filename="../libdivecomputer.c" line="549"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="562"/>
+        <location filename="../libdivecomputer.c" line="569"/>
         <source>Error parsing the gas mix</source>
         <translation>Σφάλμα στο μίγμα αερίων</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="569"/>
+        <location filename="../libdivecomputer.c" line="576"/>
         <source>Error parsing the samples</source>
         <translation>Σφάλμα στα δείγματα</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="706"/>
+        <location filename="../libdivecomputer.c" line="713"/>
         <source>Event: waiting for user action</source>
         <translation>Συμβάν: Περιμένοντας για ενέργεια από τον χρήστη</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="714"/>
+        <location filename="../libdivecomputer.c" line="721"/>
         <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="778"/>
+        <location filename="../libdivecomputer.c" line="785"/>
         <source>Error registering the event handler.</source>
         <translation>Σφάλμα στην καταχώρηση του συμβάντος</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="783"/>
+        <location filename="../libdivecomputer.c" line="790"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Σφάλμα στην καταχώρηση της ακύρωσης</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="804"/>
+        <location filename="../libdivecomputer.c" line="811"/>
         <source>Dive data import error</source>
         <translation>Σφάλμα στην εισαγωγή δεδομένων</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="843"/>
+        <location filename="../libdivecomputer.c" line="850"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Unable to create libdivecomputer context</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="850"/>
+        <location filename="../libdivecomputer.c" line="857"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Αδύνατον να ανοιχθεί το %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="858"/>
+        <location filename="../libdivecomputer.c" line="865"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="506"/>
+        <location filename="../parse-xml.c" line="516"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Περίεργο νούμερο ποσοστού %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1760"/>
+        <location filename="../parse-xml.c" line="1770"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Σφάλμα στην ανάλυση του &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1989"/>
-        <location filename="../parse-xml.c" line="2137"/>
+        <location filename="../parse-xml.c" line="1999"/>
+        <location filename="../parse-xml.c" line="2147"/>
         <source>Database query dm4_events failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1996"/>
-        <location filename="../parse-xml.c" line="2144"/>
+        <location filename="../parse-xml.c" line="2006"/>
+        <location filename="../parse-xml.c" line="2154"/>
         <source>Database query dm4_tags failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2318"/>
+        <location filename="../parse-xml.c" line="2328"/>
         <source>Database query shearwater_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2325"/>
+        <location filename="../parse-xml.c" line="2335"/>
         <source>Database query shearwater_changes failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2332"/>
+        <location filename="../parse-xml.c" line="2342"/>
         <source>Database query shearwater_profile_sample failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2451"/>
+        <location filename="../parse-xml.c" line="2461"/>
         <source>Database query cobalt_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2458"/>
+        <location filename="../parse-xml.c" line="2468"/>
         <source>Database query cobalt_buddies failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2465"/>
+        <location filename="../parse-xml.c" line="2475"/>
         <source>Database query cobalt_visibility failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2472"/>
+        <location filename="../parse-xml.c" line="2482"/>
         <source>Database query cobalt_location failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2479"/>
+        <location filename="../parse-xml.c" line="2489"/>
         <source>Database query cobalt_location (site) failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2486"/>
+        <location filename="../parse-xml.c" line="2496"/>
         <source>Database query cobalt_profile_sample failed.
 </source>
         <translation type="unfinished"/>
@@ -5763,17 +6013,17 @@ SAC (%1)</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2168"/>
-        <location filename="../parse-xml.c" line="2189"/>
-        <location filename="../parse-xml.c" line="2508"/>
-        <location filename="../parse-xml.c" line="2527"/>
+        <location filename="../parse-xml.c" line="2178"/>
+        <location filename="../parse-xml.c" line="2199"/>
+        <location filename="../parse-xml.c" line="2518"/>
+        <location filename="../parse-xml.c" line="2537"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Σφάλμα στο ερώτημα της βάσης δεδομένων &apos;%s&apos;
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2848"/>
+        <location filename="../parse-xml.c" line="2909"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Αδύνατο το άνοιγμα του stylesheet %s</translation>
     </message>
@@ -5783,362 +6033,368 @@ SAC (%1)</translation>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="820"/>
+        <location filename="../planner.c" line="841"/>
         <source>Can&apos;t find gas %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="356"/>
+        <location filename="../planner.c" line="363"/>
         <source>Too many gas mixes</source>
         <translation>Πάρα πολλά μείγματα αερίων</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="540"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="548"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="544"/>
+        <location filename="../planner.c" line="551"/>
         <source>Subsurface dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="548"/>
+        <location filename="../planner.c" line="555"/>
         <source>depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="558"/>
         <source>runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="554"/>
+        <location filename="../planner.c" line="561"/>
         <source>duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="557"/>
+        <location filename="../planner.c" line="564"/>
         <source>gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="594"/>
+        <location filename="../planner.c" line="601"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="602"/>
+        <location filename="../planner.c" line="609"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="615"/>
+        <location filename="../planner.c" line="622"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="622"/>
+        <location filename="../planner.c" line="629"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="635"/>
+        <location filename="../planner.c" line="642"/>
         <source>%3.0f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="638"/>
-        <location filename="../planner.c" line="642"/>
+        <location filename="../planner.c" line="645"/>
+        <location filename="../planner.c" line="649"/>
         <source>%3dmin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="651"/>
+        <location filename="../planner.c" line="658"/>
         <source>(SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="676"/>
+        <location filename="../planner.c" line="683"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="678"/>
+        <location filename="../planner.c" line="685"/>
         <source>Switch gas to %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="697"/>
+        <location filename="../planner.c" line="704"/>
         <source>CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="699"/>
+        <location filename="../planner.c" line="706"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="710"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="705"/>
+        <location filename="../planner.c" line="712"/>
         <source>Gas consumption:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="535"/>
-        <location filename="../planner.c" line="725"/>
-        <location filename="../planner.c" line="730"/>
-        <location filename="../planner.c" line="753"/>
+        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="732"/>
+        <location filename="../planner.c" line="737"/>
+        <location filename="../planner.c" line="762"/>
+        <location filename="../planner.c" line="772"/>
         <source>Warning:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="523"/>
+        <location filename="../planner.c" line="530"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="726"/>
+        <location filename="../planner.c" line="733"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="731"/>
+        <location filename="../planner.c" line="738"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="733"/>
+        <location filename="../planner.c" line="740"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="735"/>
+        <location filename="../planner.c" line="742"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="759"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="1064"/>
+        <location filename="../planner.c" line="769"/>
+        <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="1085"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1099"/>
+        <location filename="../profile.c" line="1113"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1102"/>
+        <location filename="../profile.c" line="1116"/>
         <source>P: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1106"/>
+        <location filename="../profile.c" line="1120"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1112"/>
+        <location filename="../profile.c" line="1126"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1115"/>
+        <location filename="../profile.c" line="1129"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1117"/>
+        <location filename="../profile.c" line="1131"/>
         <source>CNS: %u%%
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1119"/>
+        <location filename="../profile.c" line="1133"/>
         <source>pO%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1121"/>
+        <location filename="../profile.c" line="1135"/>
         <source>pN%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1123"/>
+        <location filename="../profile.c" line="1137"/>
         <source>pHe: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1140"/>
         <source>MOD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1147"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1137"/>
+        <location filename="../profile.c" line="1151"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1149"/>
+        <location filename="../profile.c" line="1163"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1152"/>
+        <location filename="../profile.c" line="1166"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1157"/>
+        <location filename="../profile.c" line="1171"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1174"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1178"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1166"/>
+        <location filename="../profile.c" line="1180"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1183"/>
         <source>TTS: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1172"/>
+        <location filename="../profile.c" line="1186"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1180"/>
+        <location filename="../profile.c" line="1194"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1196"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1185"/>
+        <location filename="../profile.c" line="1199"/>
         <source>TTS: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1188"/>
+        <location filename="../profile.c" line="1202"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1194"/>
+        <location filename="../profile.c" line="1208"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1214"/>
         <source>heartbeat: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1202"/>
+        <location filename="../profile.c" line="1216"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1205"/>
+        <location filename="../profile.c" line="1219"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1314"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1304"/>
-        <location filename="../profile.c" line="1308"/>
-        <location filename="../profile.c" line="1312"/>
+        <location filename="../profile.c" line="1318"/>
+        <location filename="../profile.c" line="1322"/>
+        <location filename="../profile.c" line="1326"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1316"/>
+        <location filename="../profile.c" line="1330"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1334"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1324"/>
-        <location filename="../profile.c" line="1328"/>
+        <location filename="../profile.c" line="1338"/>
+        <location filename="../profile.c" line="1342"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1335"/>
+        <location filename="../profile.c" line="1349"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -6269,6 +6525,7 @@ EADD: %d%s
     </message>
     <message>
         <location filename="../dive.c" line="30"/>
+        <location filename="../equipment.c" line="85"/>
         <source>oxygen</source>
         <translation type="unfinished"/>
     </message>
@@ -6323,97 +6580,97 @@ EADD: %d%s
         <translation>(καμία κατάδυση)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sun</source>
         <translation>Κυρ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Mon</source>
         <translation>Δευ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Tue</source>
         <translation>Τρι</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Wed</source>
         <translation>Τετ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Thu</source>
         <translation>Πεμ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Fri</source>
         <translation>Παρ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sat</source>
         <translation>Σαβ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jan</source>
         <translation>Ιαν</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Feb</source>
         <translation>Φεβ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Mar</source>
         <translation>Μαρ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Apr</source>
         <translation>Απρ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>May</source>
         <translation>Μαι</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jun</source>
         <translation>Ιουν</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Jul</source>
         <translation>Ιουλ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Aug</source>
         <translation>Αυγ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Sep</source>
         <translation>Σεπ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Oct</source>
         <translation>Οκτ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Nov</source>
         <translation>Νοε</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Dec</source>
         <translation>Δεκ</translation>
     </message>
@@ -7017,13 +7274,13 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
         <source>GF low</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>%</source>
         <translation type="unfinished"/>
     </message>
@@ -7033,7 +7290,7 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="335"/>
         <source>Drop to first depth</source>
         <translation type="unfinished"/>
     </message>
@@ -7043,69 +7300,69 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
         <source>Plan backgas breaks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="355"/>
         <source>Gas options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="376"/>
         <source>Bottom SAC</source>
         <translation>SAC Βυθού</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="383"/>
         <source>Deco SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="380"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="390"/>
         <source>Bottom pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="403"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="413"/>
         <source>Deco pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="449"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="462"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="478"/>
         <source>Dive notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
         <source>Display runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <source>Display segment duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="531"/>
         <source>Display transitions in deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="538"/>
         <source>Verbatim dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="387"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="410"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="397"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -7125,17 +7382,17 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="499"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="515"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/subsurface_en_GB.ts b/translations/subsurface_en_GB.ts
index 08c88d03d..164cf310e 100644
--- a/translations/subsurface_en_GB.ts
+++ b/translations/subsurface_en_GB.ts
@@ -3,12 +3,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="539"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="522"/>
         <source>Person: </source>
         <translation>Person: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="540"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="523"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Searches for buddies and divemasters</translation>
     </message>
@@ -16,40 +16,188 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="233"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="230"/>
         <source>No buddies</source>
         <translation>No buddies</translation>
     </message>
 </context>
 <context>
+    <name>ColumnNameProvider</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>GPS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Avg depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="210"/>
+        <location filename="../configuredivecomputer.cpp" line="212"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation>Could not save the backup file %1. Error Message: %2</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="226"/>
+        <location filename="../configuredivecomputer.cpp" line="228"/>
         <source>Could not open backup file: %1</source>
         <translation>Could not open backup file: %1</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="542"/>
+        <location filename="../configuredivecomputer.cpp" line="552"/>
         <source>Dive computer details read successfully</source>
         <translation>Dive computer details read successfully</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="551"/>
+        <location filename="../configuredivecomputer.cpp" line="561"/>
         <source>Setting successfully written to device</source>
         <translation>Setting successfully written to device</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="560"/>
+        <location filename="../configuredivecomputer.cpp" line="570"/>
         <source>Device firmware successfully updated</source>
         <translation>Device firmware successfully updated</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="569"/>
+        <location filename="../configuredivecomputer.cpp" line="579"/>
         <source>Device settings successfully reset</source>
         <translation>Device settings successfully reset</translation>
     </message>
@@ -847,72 +995,72 @@
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1053"/>
         <source>Backup files (*.xml)</source>
         <translation>Backup files (*.xml)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1037"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>An error occurred while saving the backup file.
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1040"/>
         <source>Backup succeeded</source>
         <translation>Backup succeeded</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1041"/>
         <source>Your settings have been saved to: %1</source>
         <translation>Your settings have been saved to: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1030"/>
         <source>Backup dive computer settings</source>
         <translation>Backup dive computer settings</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1036"/>
         <source>XML backup error</source>
         <translation>XML backup error</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1052"/>
         <source>Restore dive computer settings</source>
         <translation>Restore dive computer settings</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1056"/>
         <source>XML restore error</source>
         <translation>XML restore error</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1057"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>An error occurred while restoring the backup file.
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1063"/>
         <source>Restore succeeded</source>
         <translation>Restore succeeded</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1064"/>
         <source>Your settings have been restored successfully.</source>
         <translation>Your settings have been restored successfully.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1074"/>
         <source>Select firmware file</source>
         <translation>Select firmware file</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1075"/>
         <source>All files (*.*)</source>
         <translation>All files (*.*)</translation>
     </message>
@@ -970,12 +1118,12 @@
         <translation>Clicking here will remove this cylinder.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="410"/>
         <source>Cylinder cannot be removed</source>
         <translation>Cylinder cannot be removed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="407"/>
+        <location filename="../qt-ui/models.cpp" line="411"/>
         <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>
@@ -1051,12 +1199,12 @@
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="48"/>
         <source>Remove the selected dive computer?</source>
         <translation>Remove the selected dive computer?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="49"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
         <translation>Are you sure that you want to 
@@ -1071,22 +1219,22 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Model</source>
         <translation>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Device ID</source>
         <translation>Device ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Nickname</source>
         <translation>Nickname</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Clicking here will remove this dive computer.</translation>
     </message>
@@ -1094,117 +1242,145 @@
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="115"/>
         <source>Bailing out to OC</source>
         <translation>Bailing out to OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="117"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> begin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> end</translation>
     </message>
 </context>
 <context>
+    <name>DiveImportedModel</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="556"/>
+        <source>Date/time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
+        <source>Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>h:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>min</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1242"/>
+        <location filename="../qt-ui/models.cpp" line="1248"/>
         <source>#</source>
         <translation>No.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1245"/>
+        <location filename="../qt-ui/models.cpp" line="1251"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1248"/>
+        <location filename="../qt-ui/models.cpp" line="1254"/>
         <source>Rating</source>
         <translation>Rating</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Depth(%1)</source>
         <translation>Depth(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1254"/>
+        <location filename="../qt-ui/models.cpp" line="1260"/>
         <source>Duration</source>
         <translation>Duration</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1263"/>
         <source>Temp(%1%2)</source>
         <translation>Temp(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>Weight(%1)</source>
         <translation>Weight(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1263"/>
+        <location filename="../qt-ui/models.cpp" line="1269"/>
         <source>Suit</source>
         <translation>Suit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1266"/>
+        <location filename="../qt-ui/models.cpp" line="1272"/>
         <source>Cyl</source>
         <translation>Cyl</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1269"/>
+        <location filename="../qt-ui/models.cpp" line="1275"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1277"/>
+        <location filename="../qt-ui/models.cpp" line="1283"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1280"/>
+        <location filename="../qt-ui/models.cpp" line="1286"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1283"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>Location</source>
         <translation>Location</translation>
     </message>
@@ -1212,87 +1388,87 @@
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="787"/>
+        <location filename="../qt-ui/divelistview.cpp" line="768"/>
         <source>Expand all</source>
         <translation>Expand all</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="788"/>
+        <location filename="../qt-ui/divelistview.cpp" line="769"/>
         <source>Collapse all</source>
         <translation>Collapse all</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="789"/>
+        <location filename="../qt-ui/divelistview.cpp" line="770"/>
         <source>Collapse others</source>
         <translation>Collapse others</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="791"/>
+        <location filename="../qt-ui/divelistview.cpp" line="772"/>
         <source>Remove dive(s) from trip</source>
         <translation>Remove dive(s) from trip</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="792"/>
+        <location filename="../qt-ui/divelistview.cpp" line="773"/>
         <source>Create new trip above</source>
         <translation>Create new trip above</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="806"/>
+        <location filename="../qt-ui/divelistview.cpp" line="787"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Add dive(s) to trip immediately above</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="808"/>
+        <location filename="../qt-ui/divelistview.cpp" line="789"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Add dive(s) to trip immediately below</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="812"/>
+        <location filename="../qt-ui/divelistview.cpp" line="793"/>
         <source>Merge trip with trip above</source>
         <translation>Merge trip with trip above</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="813"/>
+        <location filename="../qt-ui/divelistview.cpp" line="794"/>
         <source>Merge trip with trip below</source>
         <translation>Merge trip with trip below</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="817"/>
+        <location filename="../qt-ui/divelistview.cpp" line="798"/>
         <source>Delete dive(s)</source>
         <translation>Delete dive(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="819"/>
+        <location filename="../qt-ui/divelistview.cpp" line="800"/>
         <source>Mark dive(s) invalid</source>
         <translation>Mark dive(s) invalid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="823"/>
+        <location filename="../qt-ui/divelistview.cpp" line="804"/>
         <source>Merge selected dives</source>
         <translation>Merge selected dives</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="825"/>
+        <location filename="../qt-ui/divelistview.cpp" line="806"/>
         <source>Renumber dive(s)</source>
         <translation>Renumber dive(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="826"/>
+        <location filename="../qt-ui/divelistview.cpp" line="807"/>
         <source>Shift times</source>
         <translation>Shift times</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="827"/>
+        <location filename="../qt-ui/divelistview.cpp" line="808"/>
         <source>Load images</source>
         <translation>Load images</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Open image files</source>
         <translation>Open image files</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -1477,100 +1653,100 @@
         <translation>Sand</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF files (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="268"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>CSV files (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="68"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Generic format that is used for data exchange between a variety of diving related programs.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>Comma separated values describing the dive profile.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation>Comma separated values of the dive information. This includes most of the dive details but no profile information.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Send the dive data to divelogs.de website.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>Send the dive data to dive-share.appspot.com website</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>HTML export of the dive locations, visualised on a world map.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurface native XML format.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
         <source>Write depths of images to file.</source>
         <translation>Write depths of images to file.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export UDDF file as</source>
         <translation>Export UDDF file as</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="267"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
         <source>Export CSV file as</source>
         <translation>Export CSV file as</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="278"/>
         <source>Export world map</source>
         <translation>Export world map</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="299"/>
         <source>HTML files (*.html)</source>
         <translation>HTML files (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="283"/>
         <source>Export Subsurface XML</source>
         <translation>Export Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="284"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML files (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
         <source>Save image depths</source>
         <translation>Save image depths</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="298"/>
         <source>Export HTML files as</source>
         <translation>Export HTML files as</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
         <source>Can&apos;t open file %s</source>
         <translation>Can&apos;t open file %s</translation>
     </message>
@@ -1583,248 +1759,228 @@
         <translation>Import dive log file</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
-        <source>CSV options</source>
-        <translation>CSV options</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="281"/>
-        <source>Pre-configured imports</source>
-        <translation>Pre-configured imports</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="122"/>
-        <source>Depth</source>
-        <translation>Depth</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="142"/>
-        <source>Stopdepth</source>
-        <translation>Stop depth</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="162"/>
-        <source>Pressure</source>
-        <translation>Pressure</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="176"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="466"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
         <source>Time</source>
         <translation>Time</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="183"/>
-        <source>Temp</source>
-        <translation>Temp</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="213"/>
-        <source>NDL</source>
-        <translation>NDL</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="233"/>
-        <source>TTS</source>
-        <translation>TTS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="253"/>
-        <source>Cns</source>
-        <translation>CNS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="58"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="789"/>
-        <source>Field separator</source>
-        <translation>Field separator</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="35"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="363"/>
-        <source>Units</source>
-        <translation>Units</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="42"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="370"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="97"/>
         <source>Metric</source>
         <translation>Metric</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="47"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="375"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="102"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="169"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="298"/>
-        <source>Manual dives</source>
-        <translation>Manual dives</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="316"/>
-        <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source>
-        <translation>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="319"/>
-        <source>Date format</source>
-        <translation>Date format</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="332"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="59"/>
         <source>dd.mm.yyyy</source>
         <translation>dd.mm.yyyy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="337"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="64"/>
         <source>mm/dd/yyyy</source>
         <translation>mm/dd/yyyy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="342"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="69"/>
         <source>yyyy-mm-dd</source>
         <translation>yyyy-mm-dd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="392"/>
-        <source>Dive #</source>
-        <translation>Dive No.</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="426"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="439"/>
-        <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source>
-        <translation>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+        <source>Dive #</source>
+        <translation>Dive No.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="429"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="500"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="513"/>
-        <source>Dive duration in seconds or in min:sec format</source>
-        <translation>Dive duration in seconds or in min:sec format</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="503"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
         <source>Duration</source>
         <translation>Duration</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="574"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="591"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
         <source>Tags</source>
         <translation>Tags</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="608"/>
-        <source>Cyl size</source>
-        <translation>Cyl. size</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="625"/>
-        <source>Air temp</source>
-        <translation>Air temp.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="642"/>
-        <source>Start Pressure</source>
-        <translation>Start Pressure</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="659"/>
-        <source>Water temp</source>
-        <translation>Water temp.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="676"/>
-        <source>End Press</source>
-        <translation>End Press.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="693"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
         <source>O₂</source>
         <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="710"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
         <source>He</source>
         <translation>He</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="742"/>
-        <source>Choose duration format.</source>
-        <translation>Choose duration format.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="745"/>
-        <source>Duration format</source>
-        <translation>Duration format</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="758"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="78"/>
         <source>Seconds</source>
         <translation>Seconds</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="763"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
         <source>Minutes</source>
         <translation>Minutes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="768"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="88"/>
         <source>Minutes:seconds</source>
         <translation>Minutes:seconds</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="540"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
         <source>Location</source>
         <translation>Location</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="409"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
         <source>Max depth</source>
         <translation>Max depth</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="386"/>
-        <source>Field configuration</source>
-        <translation>Field configuration</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+        <source>Tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+        <source>Samples pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
         <source>Mean depth</source>
         <translation>Mean depth</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="483"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="523"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
         <source>Notes</source>
         <translation>Notes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="557"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
         <source>Weight</source>
         <translation>Weight</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DivePlanner</name>
@@ -1867,42 +2023,42 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
         <source>unknown</source>
         <translation>unknown</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="691"/>
         <source>Final depth</source>
         <translation>Final depth</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="693"/>
         <source>Run time</source>
         <translation>Run time</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="701"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="695"/>
         <source>Duration</source>
         <translation>Duration</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="703"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
         <source>Used gas</source>
         <translation>Used gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="705"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
         <source>CC set point</source>
         <translation>CC set point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1044"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1051"/>
         <source>Discard the plan?</source>
         <translation>Discard the plan?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1045"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1052"/>
         <source>You are about to discard your plan.</source>
         <translation>You are about to discard your plan.</translation>
     </message>
@@ -1910,22 +2066,22 @@
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="257"/>
         <source>Dive planner points</source>
         <translation>Dive planner points</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="261"/>
         <source>Available gases</source>
         <translation>Available gases</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="284"/>
         <source>Add dive data point</source>
         <translation>Add dive data point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="304"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="293"/>
         <source>Save new</source>
         <translation>Save new</translation>
     </message>
@@ -1933,92 +2089,112 @@
 <context>
     <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Depth</source>
         <translation>Depth</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
         <source>Time</source>
         <translation>Time</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
         <source>Pressure</source>
         <translation>Pressure</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>Temperature</source>
         <translation>Temperature</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
         <source>Color</source>
         <translation>Colour</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
         <source>Pressure S</source>
         <translation>Pressure S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
+        <source>Setpoint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
+        <source>Sensor1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
+        <source>Sensor2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
+        <source>Sensor3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
         <source>Ambient pressure</source>
         <translation>Ambient pressure</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
-        <source>Heart Beat</source>
-        <translation>Heart Beat</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
+        <source>Heart beat</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
-        <source>Gradient Factor</source>
-        <translation>Gradient Factor</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/>
+        <source>Gradient factor</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
-        <source>Mean Depth/s</source>
-        <translation>Mean Depth/s</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
+        <source>Mean depth/s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
         <source>Pressure I</source>
         <translation>Pressure I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
         <source>User entered</source>
         <translation>User entered</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
         <source>Cylinder index</source>
         <translation>Cylinder index</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
         <source>Ceiling</source>
         <translation>Ceiling</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
@@ -2069,127 +2245,127 @@
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1437"/>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1443"/>
+        <location filename="../qt-ui/models.cpp" line="1489"/>
         <source>#</source>
         <translation>No.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1440"/>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1492"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1443"/>
-        <location filename="../qt-ui/models.cpp" line="1489"/>
+        <location filename="../qt-ui/models.cpp" line="1449"/>
+        <location filename="../qt-ui/models.cpp" line="1495"/>
         <source>Rating</source>
         <translation>Rating</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1452"/>
         <source>Depth</source>
         <translation>Depth</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1458"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1461"/>
         <source>Weight</source>
         <translation>Weight</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>Weight(%1)</source>
         <translation>Weight(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1458"/>
-        <location filename="../qt-ui/models.cpp" line="1504"/>
+        <location filename="../qt-ui/models.cpp" line="1464"/>
+        <location filename="../qt-ui/models.cpp" line="1510"/>
         <source>Suit</source>
         <translation>Suit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1461"/>
-        <location filename="../qt-ui/models.cpp" line="1507"/>
+        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1513"/>
         <source>Cyl</source>
         <translation>Cyl</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1464"/>
-        <location filename="../qt-ui/models.cpp" line="1510"/>
+        <location filename="../qt-ui/models.cpp" line="1470"/>
+        <location filename="../qt-ui/models.cpp" line="1516"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1473"/>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1527"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
-        <location filename="../qt-ui/models.cpp" line="1524"/>
+        <location filename="../qt-ui/models.cpp" line="1482"/>
+        <location filename="../qt-ui/models.cpp" line="1530"/>
         <source>Location</source>
         <translation>Location</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>Depth(%1)</source>
         <translation>Depth(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1449"/>
-        <location filename="../qt-ui/models.cpp" line="1495"/>
+        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1501"/>
         <source>Duration</source>
         <translation>Duration</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1498"/>
+        <location filename="../qt-ui/models.cpp" line="1504"/>
         <source>Temp(%1%2)</source>
         <translation>Temp(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1470"/>
-        <location filename="../qt-ui/models.cpp" line="1518"/>
+        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1524"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -2197,95 +2373,95 @@
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="98"/>
         <source>no dives were selected</source>
         <translation>no dives were selected</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="117"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>failed to create zip file for upload: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="143"/>
         <source>cannot create temporary file: %s</source>
         <translation>cannot create temporary file: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/>
         <source>internal error: %s</source>
         <translation>internal error: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="169"/>
         <source>internal error</source>
         <translation>internal error</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="629"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="828"/>
         <source>Done</source>
         <translation>Done</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/>
         <source>Uploading dive list...</source>
         <translation>Uploading dive list...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="692"/>
         <source>Downloading dive list...</source>
         <translation>Downloading dive list...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="741"/>
         <source>Downloading %1 dives...</source>
         <translation>Downloading %1 dives...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="785"/>
         <source>Download finished - %1</source>
         <translation>Download finished - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="802"/>
         <source>Corrupted download</source>
         <translation>Corrupted download</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>The archive could not be opened:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
         <source>Upload failed</source>
         <translation>Upload failed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/>
         <source>Upload successful</source>
         <translation>Upload successful</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
         <source>Login failed</source>
         <translation>Login failed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
         <source>Cannot parse response</source>
         <translation>Cannot parse response</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
         <source>Error: %1</source>
         <translation>Error: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="829"/>
         <source>Upload finished</source>
         <translation>Upload finished</translation>
     </message>
@@ -2293,54 +2469,52 @@
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="169"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="400"/>
         <source>Retry</source>
         <translation>Retry</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="264"/>
         <source>Find Uemis dive computer</source>
         <translation>Find Uemis dive computer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Choose file for divecomputer download logfile</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Log files (*.log)</source>
         <translation>Log files (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="362"/>
         <source>Warning</source>
         <translation>Warning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="363"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>Saving the libdivecomputer dump will NOT download dives to the dive list.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="374"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Choose file for divecomputer binary dump file</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="375"/>
         <source>Dump files (*.bin)</source>
         <translation>Dump files (*.bin)</translation>
     </message>
@@ -2348,7 +2522,7 @@
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="101"/>
         <source>Vendor</source>
         <translation>Vendor</translation>
     </message>
@@ -2358,54 +2532,74 @@
         <translation>Download from dive computer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="31"/>
         <source>Device or mount point</source>
         <translation>Device or mount point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="111"/>
         <source>Dive computer</source>
         <translation>Dive computer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="132"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="45"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="80"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="94"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="52"/>
         <source>Force download of all dives</source>
         <translation>Force download of all dives</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
         <source>Always prefer downloaded dives</source>
         <translation>Always prefer downloaded dives</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="189"/>
         <source>Cancel</source>
         <translation>Cancel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/>
+        <source>Downloaded Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
+        <source>Select all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
+        <source>Unselect all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
         <source>Save libdivecomputer logfile</source>
         <translation>Save libdivecomputer logfile</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="87"/>
         <source>Save libdivecomputer dumpfile</source>
         <translation>Save libdivecomputer dumpfile</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
         <source>Download into new trip</source>
         <translation>Download into new trip</translation>
     </message>
@@ -2413,12 +2607,12 @@
 <context>
     <name>ExtraDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Key</source>
         <translation>Key</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Value</source>
         <translation>Value</translation>
     </message>
@@ -2432,22 +2626,20 @@
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="245"/>
-        <source>Your dive profile was updated to facebook.</source>
-        <translation>Your dive profile was updated on facebook.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
-        <source>Photo Upload Failed</source>
-        <translation>Photo Upload Failed</translation>
+        <source>Your dive profile was updated to Facebook.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="250"/>
-        <source>Your dive profile was not updated to facebook, 
+        <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
-        <translation>Your dive profile was not updated on facebook, 
- please send the following to the developer. 
-</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+        <source>Photo Upload Failed</source>
+        <translation>Photo Upload Failed</translation>
     </message>
 </context>
 <context>
@@ -2489,17 +2681,17 @@
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1544"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1621"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>This feature is not yet available for the selected dive computer.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1624"/>
         <source>Firmware update failed!</source>
         <translation>Firmware update failed.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1550"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1627"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Could not a establish connection to the dive computer.</translation>
     </message>
@@ -2507,7 +2699,7 @@
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="128"/>
+        <location filename="../qt-ui/globe.cpp" line="119"/>
         <source>Edit selected dive locations</source>
         <translation>Edit selected dive locations</translation>
     </message>
@@ -2515,7 +2707,7 @@
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="566"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="549"/>
         <source>Location: </source>
         <translation>Location: </translation>
     </message>
@@ -2523,7 +2715,7 @@
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="286"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="283"/>
         <source>No location set</source>
         <translation>No location set</translation>
     </message>
@@ -2531,330 +2723,335 @@
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="133"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
+        <location filename="../qt-ui/maintab.cpp" line="497"/>
         <source>Location</source>
         <translation>Location</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="67"/>
         <source>Coordinates</source>
         <translation>Coordinates</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="169"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="154"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="222"/>
+        <location filename="../qt-ui/maintab.ui" line="277"/>
         <source>Tags</source>
         <translation>Tags</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="186"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
         <source>Rating</source>
         <translation>Rating</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="221"/>
         <source>Visibility</source>
         <translation>Visibility</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="230"/>
         <source>Suit</source>
         <translation>Suit</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="465"/>
+        <location filename="../qt-ui/maintab.cpp" line="470"/>
         <source>Dive notes</source>
         <translation>Dive notes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
-        <location filename="../qt-ui/maintab.ui" line="648"/>
-        <location filename="../qt-ui/maintab.cpp" line="277"/>
+        <location filename="../qt-ui/maintab.ui" line="74"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="102"/>
+        <location filename="../qt-ui/maintab.ui" line="677"/>
+        <location filename="../qt-ui/maintab.cpp" line="279"/>
         <source>Air temp.</source>
         <translation>Air temp.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <location filename="../qt-ui/maintab.ui" line="667"/>
-        <location filename="../qt-ui/maintab.cpp" line="278"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.ui" line="696"/>
+        <location filename="../qt-ui/maintab.cpp" line="280"/>
         <source>Water temp.</source>
         <translation>Water temp.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="229"/>
-        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.ui" line="284"/>
+        <location filename="../qt-ui/maintab.cpp" line="498"/>
         <source>Notes</source>
         <translation>Notes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="369"/>
+        <location filename="../qt-ui/maintab.ui" line="398"/>
         <source>Equipment</source>
         <translation>Equipment</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="496"/>
+        <location filename="../qt-ui/maintab.ui" line="525"/>
         <source>Gases used</source>
         <translation>Gases used</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="515"/>
+        <location filename="../qt-ui/maintab.ui" line="544"/>
         <source>Gas consumed</source>
         <translation>Gas consumed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="553"/>
+        <location filename="../qt-ui/maintab.ui" line="582"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="591"/>
+        <location filename="../qt-ui/maintab.ui" line="620"/>
         <source>Max. depth</source>
         <translation>Max. depth</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="629"/>
+        <location filename="../qt-ui/maintab.ui" line="658"/>
         <source>Air pressure</source>
         <translation>Air pressure</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="686"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>Dive time</source>
         <translation>Dive time</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="845"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
         <source>Total time</source>
         <translation>Total time</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="903"/>
+        <location filename="../qt-ui/maintab.ui" line="932"/>
         <source>Gas consumption</source>
         <translation>Gas consumption</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="962"/>
+        <location filename="../qt-ui/maintab.ui" line="991"/>
         <source>Extra data</source>
         <translation>Extra data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="968"/>
+        <location filename="../qt-ui/maintab.ui" line="997"/>
         <source>Additional data from dive computer</source>
         <translation>Additional data from dive computer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="54"/>
-        <location filename="../qt-ui/maintab.ui" line="458"/>
+        <location filename="../qt-ui/maintab.ui" line="83"/>
+        <location filename="../qt-ui/maintab.ui" line="487"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="61"/>
+        <location filename="../qt-ui/maintab.ui" line="90"/>
         <source>Time</source>
         <translation>Time</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="425"/>
+        <location filename="../qt-ui/maintab.ui" line="454"/>
         <source>Dive info</source>
         <translation>Dive info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="477"/>
+        <location filename="../qt-ui/maintab.ui" line="506"/>
         <source>Interval</source>
         <translation>Interval</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="534"/>
-        <location filename="../qt-ui/maintab.ui" line="799"/>
+        <location filename="../qt-ui/maintab.ui" line="563"/>
+        <location filename="../qt-ui/maintab.ui" line="828"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="610"/>
+        <location filename="../qt-ui/maintab.ui" line="639"/>
         <source>Avg. depth</source>
         <translation>Avg. depth</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="572"/>
+        <location filename="../qt-ui/maintab.ui" line="601"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="734"/>
         <source>Salinity</source>
         <translation>Salinity</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="742"/>
+        <location filename="../qt-ui/maintab.ui" line="771"/>
         <source>Stats</source>
         <translation>Stats</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="775"/>
+        <location filename="../qt-ui/maintab.ui" line="804"/>
         <source>Depth</source>
         <translation>Depth</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="787"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Temperature</source>
         <translation>Temperature</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="813"/>
+        <location filename="../qt-ui/maintab.ui" line="842"/>
         <source>Duration</source>
         <translation>Duration</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="864"/>
+        <location filename="../qt-ui/maintab.ui" line="893"/>
         <source>Dives</source>
         <translation>Dives</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="948"/>
+        <location filename="../qt-ui/maintab.ui" line="977"/>
         <source>Photos</source>
         <translation>Photos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="95"/>
+        <location filename="../qt-ui/maintab.cpp" line="87"/>
         <source>Cylinders</source>
         <translation>Cylinders</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="99"/>
+        <location filename="../qt-ui/maintab.cpp" line="91"/>
         <source>Weights</source>
         <translation>Weights</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="55"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Apply changes</source>
         <translation>Apply changes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="59"/>
+        <location filename="../qt-ui/maintab.cpp" line="50"/>
         <source>Discard changes</source>
         <translation>Discard changes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="96"/>
+        <location filename="../qt-ui/maintab.cpp" line="88"/>
         <source>Add cylinder</source>
         <translation>Add cylinder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="100"/>
+        <location filename="../qt-ui/maintab.cpp" line="92"/>
         <source>Add weight system</source>
         <translation>Add weight system</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="274"/>
+        <location filename="../qt-ui/maintab.cpp" line="276"/>
         <source>Air temp. [%1]</source>
         <translation>Air temp. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="275"/>
+        <location filename="../qt-ui/maintab.cpp" line="277"/>
         <source>Water temp. [%1]</source>
         <translation>Water temp. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="312"/>
+        <location filename="../qt-ui/maintab.cpp" line="314"/>
         <source>This trip is being edited.</source>
         <translation>This trip is being edited.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="320"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Multiple dives are being edited.</source>
         <translation>Multiple dives are being edited.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.cpp" line="324"/>
         <source>This dive is being edited.</source>
         <translation>This dive is being edited.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="436"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
+        <location filename="../qt-ui/maintab.cpp" line="465"/>
         <source>Trip notes</source>
         <translation>Trip notes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="458"/>
+        <location filename="../qt-ui/maintab.cpp" line="463"/>
         <source>Trip location</source>
         <translation>Trip location</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="526"/>
-        <location filename="../qt-ui/maintab.cpp" line="558"/>
-        <location filename="../qt-ui/maintab.cpp" line="562"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
         <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="574"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="555"/>
+        <location filename="../qt-ui/maintab.cpp" line="563"/>
         <source>Deepest dive</source>
         <translation>Deepest dive</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="556"/>
+        <location filename="../qt-ui/maintab.cpp" line="564"/>
         <source>Shallowest dive</source>
         <translation>Shallowest dive</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="569"/>
+        <location filename="../qt-ui/maintab.cpp" line="577"/>
         <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="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="578"/>
         <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="571"/>
+        <location filename="../qt-ui/maintab.cpp" line="579"/>
         <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="582"/>
+        <location filename="../qt-ui/maintab.cpp" line="590"/>
         <source>Highest temperature</source>
         <translation>Highest temperature</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="583"/>
+        <location filename="../qt-ui/maintab.cpp" line="591"/>
         <source>Lowest temperature</source>
         <translation>Lowest temperature</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="584"/>
+        <location filename="../qt-ui/maintab.cpp" line="592"/>
         <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="594"/>
+        <location filename="../qt-ui/maintab.cpp" line="602"/>
         <source>Longest dive</source>
         <translation>Longest dive</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="595"/>
+        <location filename="../qt-ui/maintab.cpp" line="603"/>
         <source>Shortest dive</source>
         <translation>Shortest dive</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="596"/>
+        <location filename="../qt-ui/maintab.cpp" line="604"/>
         <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="620"/>
+        <location filename="../qt-ui/maintab.cpp" line="628"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -2863,17 +3060,17 @@ mixed from Air and using:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="624"/>
+        <location filename="../qt-ui/maintab.cpp" line="632"/>
         <source> and </source>
         <translation> and </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="911"/>
+        <location filename="../qt-ui/maintab.cpp" line="925"/>
         <source>Discard the changes?</source>
         <translation>Discard the changes?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="912"/>
+        <location filename="../qt-ui/maintab.cpp" line="926"/>
         <source>You are about to discard your changes.</source>
         <translation>You are about to discard your changes.</translation>
     </message>
@@ -3020,7 +3217,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="296"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="232"/>
         <source>Open</source>
         <translation>Open</translation>
     </message>
@@ -3380,90 +3577,90 @@ p, li { white-space: pre-wrap; }
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="252"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="229"/>
         <source>Open file</source>
         <translation>Open file</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="256"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="233"/>
         <source>Cancel</source>
         <translation>Cancel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="332"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="309"/>
         <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="444"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
         <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="491"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
         <source>Print runtime table</source>
         <translation>Print runtime table</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="834"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="811"/>
         <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="836"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="813"/>
         <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="841"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="818"/>
         <source>Save changes?</source>
         <translation>Save changes?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1196"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1173"/>
         <source>Save file as</source>
         <translation>Save file as</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1337"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1314"/>
         <source>Open dive log file</source>
         <translation>Open dive log file</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="819"/>
         <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="300"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="444"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="277"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Warning</source>
         <translation>Warning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1180"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1157"/>
         <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="625"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="602"/>
         <source>Yearly statistics</source>
         <translation>Yearly statistics</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1197"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1174"/>
         <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="1338"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1315"/>
         <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source>
         <translation>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <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>
@@ -3471,7 +3668,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="651"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="634"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Filter shows %1 (of %2) dives</translation>
     </message>
@@ -3479,12 +3676,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="239"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="243"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
@@ -3493,27 +3690,27 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="244"/>
         <source>Not now</source>
         <translation>Not now</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="245"/>
         <source>Update firmware</source>
         <translation>Update firmware</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
         <source>Firmware upgrade notice</source>
         <translation>Firmware upgrade notice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
         <source>Save the downloaded firmware as</source>
         <translation>Save the downloaded firmware as</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
         <source>HEX files (*.hex)</source>
         <translation>HEX files (*.hex)</translation>
     </message>
@@ -3521,54 +3718,69 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Open circuit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="481"/>
         <source>Last stop at 20ft</source>
         <translation>Last stop at 20ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="482"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% avg. depth to 20ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="489"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
         <source>20ft to surface</source>
         <translation>20ft to surface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="485"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
         <source>Last stop at 6m</source>
         <translation>Last stop at 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% avg. depth to 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="494"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
         <source>6m to surface</source>
         <translation>6m to surface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="497"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="498"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
         <source>cuft/min</source>
         <translation>cuft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="506"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="507"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="500"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="501"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
@@ -3687,6 +3899,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="816"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -3721,57 +3934,87 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="795"/>
+        <source>CCR: Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="809"/>
+        <source>Default CCR set-point for dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="832"/>
+        <source>pSCR O₂ metabolism rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="839"/>
+        <source>pSCR ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="846"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="859"/>
+        <source>1:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="875"/>
         <source>System default</source>
         <translation>System default</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="843"/>
+        <location filename="../qt-ui/preferences.ui" line="914"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="849"/>
+        <location filename="../qt-ui/preferences.ui" line="920"/>
         <source>Proxy type</source>
         <translation>Proxy type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="862"/>
+        <location filename="../qt-ui/preferences.ui" line="933"/>
         <source>Host</source>
         <translation>Hostname</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="888"/>
+        <location filename="../qt-ui/preferences.ui" line="959"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="914"/>
+        <location filename="../qt-ui/preferences.ui" line="985"/>
         <source>Requires authentication</source>
         <translation>Requires authentication</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="934"/>
+        <location filename="../qt-ui/preferences.ui" line="1005"/>
         <source>Username</source>
         <translation>Username</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="957"/>
+        <location filename="../qt-ui/preferences.ui" line="1028"/>
         <source>Password</source>
         <translation>Password</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="985"/>
-        <source>about:blank</source>
-        <translation>about:blank</translation>
+        <location filename="../qt-ui/preferences.ui" line="1079"/>
+        <source>Disconnect from Facebook</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1011"/>
-        <source>Disconnect from facebook</source>
-        <translation>Disconnect from facebook</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="824"/>
+        <location filename="../qt-ui/preferences.ui" line="895"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
@@ -3926,52 +4169,52 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="28"/>
+        <location filename="../qt-ui/preferences.cpp" line="44"/>
         <source>No proxy</source>
         <translation>No proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="29"/>
+        <location filename="../qt-ui/preferences.cpp" line="45"/>
         <source>System proxy</source>
         <translation>System proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="30"/>
+        <location filename="../qt-ui/preferences.cpp" line="46"/>
         <source>HTTP proxy</source>
         <translation>HTTP proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="31"/>
+        <location filename="../qt-ui/preferences.cpp" line="47"/>
         <source>SOCKS proxy</source>
         <translation>SOCKS proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="291"/>
+        <location filename="../qt-ui/preferences.cpp" line="324"/>
         <source>Restart required</source>
         <translation>Restart required</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="292"/>
+        <location filename="../qt-ui/preferences.cpp" line="325"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>To correctly load a new language you must restart Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="456"/>
+        <location filename="../qt-ui/preferences.cpp" line="494"/>
         <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
         <translation>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Open default log file</source>
         <translation>Open default log file</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="455"/>
+        <location filename="../qt-ui/preferences.cpp" line="493"/>
         <source>Warning</source>
         <translation>Warning</translation>
     </message>
@@ -3979,17 +4222,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="91"/>
+        <location filename="../qt-ui/printdialog.cpp" line="85"/>
         <source>&amp;Preview</source>
         <translation>&amp;Preview</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="88"/>
+        <location filename="../qt-ui/printdialog.cpp" line="82"/>
         <source>P&amp;rint</source>
         <translation>P&amp;rint</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="103"/>
+        <location filename="../qt-ui/printdialog.cpp" line="97"/>
         <source>Print</source>
         <translation>Print</translation>
     </message>
@@ -3997,42 +4240,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="20"/>
         <source>Dive#</source>
         <translation>Dive No.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="21"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="22"/>
         <source>Depth</source>
         <translation>Depth</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="23"/>
         <source>Duration</source>
         <translation>Duration</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Master</source>
         <translation>Master</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="34"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Location</source>
         <translation>Location</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <location filename="../qt-ui/printlayout.cpp" line="63"/>
         <source>Subsurface cannot find a usable printer on this system!</source>
         <translation>Subsurface cannot find a usable printer on this system.</translation>
     </message>
@@ -4098,72 +4341,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2095"/>
+        <location filename="../qt-ui/models.cpp" line="2101"/>
         <source>unknown</source>
         <translation>unknown</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2100"/>
+        <location filename="../qt-ui/models.cpp" line="2106"/>
         <source>Dive #%1 - %2</source>
         <translation>Dive No. %1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2103"/>
+        <location filename="../qt-ui/models.cpp" line="2109"/>
         <source>Max depth: %1 %2</source>
         <translation>Max depth: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2110"/>
+        <location filename="../qt-ui/models.cpp" line="2116"/>
         <source>Duration: %1 min</source>
         <translation>Duration: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2115"/>
+        <location filename="../qt-ui/models.cpp" line="2121"/>
         <source>Gas used:</source>
         <translation>Gas used:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2117"/>
+        <location filename="../qt-ui/models.cpp" line="2123"/>
         <source>Tags:</source>
         <translation>Tags:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2119"/>
+        <location filename="../qt-ui/models.cpp" line="2125"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2121"/>
+        <location filename="../qt-ui/models.cpp" line="2127"/>
         <source>Weights:</source>
         <translation>Weights:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2126"/>
+        <location filename="../qt-ui/models.cpp" line="2132"/>
         <source>Notes:</source>
         <translation>Notes:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2133"/>
+        <location filename="../qt-ui/models.cpp" line="2139"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2135"/>
+        <location filename="../qt-ui/models.cpp" line="2141"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2137"/>
+        <location filename="../qt-ui/models.cpp" line="2143"/>
         <source>Suit:</source>
         <translation>Suit:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2139"/>
+        <location filename="../qt-ui/models.cpp" line="2145"/>
         <source>Viz:</source>
         <translation>Viz:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2141"/>
+        <location filename="../qt-ui/models.cpp" line="2147"/>
         <source>Rating:</source>
         <translation>Rating:</translation>
     </message>
@@ -4171,103 +4414,108 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="628"/>
         <source> (#%1 of %2)</source>
         <translation> (No.%1 of %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="630"/>
+        <source>Unknown dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="647"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>Show NDL / TTS was disabled because of excessive processing time</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1168"/>
         <source>Make first divecomputer</source>
         <translation>Make first dive computer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Delete this divecomputer</source>
         <translation>Delete this dive computer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1184"/>
         <source>Add gas change</source>
         <translation>Add gas change</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1187"/>
         <source> (Tank %1)</source>
         <translation> (Tank %1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1195"/>
         <source>Add set-point change</source>
         <translation>Add set-point change</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1197"/>
         <source>Add bookmark</source>
         <translation>Add bookmark</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
         <source>Remove event</source>
         <translation>Remove event</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1206"/>
         <source>Hide similar events</source>
         <translation>Hide similar events</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1213"/>
         <source>Edit name</source>
         <translation>Edit name</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1242"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1249"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>Adjust pressure of tank %1 (currently interpolated as %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1264"/>
         <source>Unhide all events</source>
         <translation>Unhide all events</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide events</source>
         <translation>Hide events</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide all %1 events?</source>
         <translation>Hide all %1 events?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1333"/>
         <source>Remove the selected event?</source>
         <translation>Remove the selected event?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1334"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1424"/>
         <source>Edit name of bookmark</source>
         <translation>Edit name of bookmark</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
         <source>Custom name:</source>
         <translation>Custom name:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1430"/>
         <source>Name is too long!</source>
         <translation>Name is too long.</translation>
     </message>
@@ -4275,102 +4523,102 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>AIR</source>
         <translation>AIR</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>OXYGEN</source>
         <translation>OXYGEN</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="208"/>
         <source>Remove this point</source>
         <translation>Remove this point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="57"/>
         <source>Close</source>
         <translation>Close</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="42"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="25"/>
         <source>Average</source>
         <translation>Average</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="45"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="28"/>
         <source>Minimum</source>
         <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="48"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="31"/>
         <source>Maximum</source>
         <translation>Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="297"/>
+        <location filename="../qt-ui/globe.cpp" line="296"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>Move the map and double-click to set the dive location</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="525"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="526"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="550"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="551"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="570"/>
+        <location filename="../qt-ui/models.cpp" line="574"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="571"/>
+        <location filename="../qt-ui/models.cpp" line="575"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="595"/>
+        <location filename="../qt-ui/models.cpp" line="599"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="596"/>
+        <location filename="../qt-ui/models.cpp" line="600"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="513"/>
         <source>Invalid response from server</source>
         <translation>Invalid response from server</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="567"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation>Expected XML tag &apos;DiveDates&apos; not found</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Malformed XML response. Line %1: %2</translation>
     </message>
@@ -4378,12 +4626,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1450"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1518"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>This feature is not yet available for the selected dive computer.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1442"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Could not a establish connection to the dive computer.</translation>
     </message>
@@ -4397,12 +4645,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
-        <location filename="../qt-ui/simplewidgets.cpp" line="151"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="134"/>
         <source>New starting number</source>
         <translation>New starting number</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="149"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="132"/>
         <source>New number</source>
         <translation>New number</translation>
     </message>
@@ -4410,12 +4658,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1575"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1653"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>This feature is not yet available for the selected dive computer.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1579"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1657"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Could not a establish connection to the dive computer.</translation>
     </message>
@@ -4494,12 +4742,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Which date and time are displayed on the image?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="276"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="259"/>
         <source>Open image file</source>
         <translation>Open image file</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="278"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="261"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -4552,10 +4800,9 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <name>SocialNetworkDialog</name>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="282"/>
-        <source>Dive Date: %1 
+        <source>Dive date: %1 
 </source>
-        <translation>Dive Date: %1 
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="285"/>
@@ -4578,10 +4825,9 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="290"/>
-        <source>Dive Location: %1 
+        <source>Dive location: %1 
 </source>
-        <translation>Dive Location: %1 
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="293"/>
@@ -4699,47 +4945,47 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="329"/>
         <source>Webservice</source>
         <translation>Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="393"/>
         <source>Connecting...</source>
         <translation>Connecting...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
         <source>Download finished</source>
         <translation>Download finished</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Download error: %1</source>
         <translation>Download error: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="436"/>
         <source>Connection error: </source>
         <translation>Connection error: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
         <source>Download successful</source>
         <translation>Download successful</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="439"/>
         <source>Invalid user identifier!</source>
         <translation>Invalid user identifier.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="312"/>
         <source>Enter User ID and click Download</source>
         <translation>Enter User ID and click download</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="442"/>
         <source>Cannot parse response!</source>
         <translation>Cannot parse response.</translation>
     </message>
@@ -4747,7 +4993,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="592"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="575"/>
         <source>Suits: </source>
         <translation>Suits: </translation>
     </message>
@@ -4755,7 +5001,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="119"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="116"/>
         <source>No suit set</source>
         <translation>No suit set</translation>
     </message>
@@ -4772,7 +5018,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="513"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="496"/>
         <source>Tags: </source>
         <translation>Tags: </translation>
     </message>
@@ -4780,7 +5026,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="144"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="141"/>
         <source>Empty tags</source>
         <translation>Empty tags</translation>
     </message>
@@ -4788,17 +5034,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -4806,7 +5052,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="141"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="131"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
@@ -4814,7 +5060,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1090"/>
+        <location filename="../qt-ui/models.cpp" line="1094"/>
         <source> (%1 shown)</source>
         <translation> (%1 shown)</translation>
     </message>
@@ -4822,72 +5068,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="64"/>
         <source>Check for updates.</source>
         <translation>Check for updates.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="66"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface was unable to check for updates.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="70"/>
         <source>The following error occurred:</source>
         <translation>The following error occurred:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="72"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
         <source>Please check your internet connection.</source>
         <translation>Please check your internet connection.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="85"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="84"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>You are using the latest version of Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="88"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="95"/>
         <source>A new version of Subsurface is available.</source>
         <translation>A new version of Subsurface is available.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="97"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
         <source>Latest version is %1, please check with your OS vendor for updates.</source>
         <translation>Latest version is %1, please check with your OS vendor for updates.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="103"/>
         <source>Newest release version is </source>
         <translation>Newest release version is </translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="105"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
         <source>The server returned the following information:</source>
         <translation>The server returned the following information:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="121"/>
         <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
         <source>Decline</source>
         <translation>Decline</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="124"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
         <source>Accept</source>
         <translation>Accept</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="126"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="125"/>
         <source>Automatic check for updates</source>
         <translation>Automatic check for updates</translation>
     </message>
@@ -4895,13 +5141,13 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UserManual</name>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="55"/>
+        <location filename="../qt-ui/usermanual.cpp" line="54"/>
         <source>User Manual</source>
         <translation>User Manual</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="72"/>
-        <location filename="../qt-ui/usermanual.cpp" line="78"/>
+        <location filename="../qt-ui/usermanual.cpp" line="71"/>
+        <location filename="../qt-ui/usermanual.cpp" line="77"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Cannot find the Subsurface manual</translation>
     </message>
@@ -4979,85 +5225,85 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Where are you importing data from?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
         <source>
 Operating System: %1</source>
         <translation>
 Operating System: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 CPU Architecture: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 Language: %1</source>
         <translation>
 Language: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="93"/>
         <source>Should we ask you later?</source>
         <translation>Should we ask you later?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Don&apos;t ask me again</source>
         <translation>Don&apos;t ask me again</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Ask later</source>
         <translation>Ask later</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
         <source>Submit user survey.</source>
         <translation>Submit user survey.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask again?</source>
         <translation>Ask again?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="17"/>
         <source>Send</source>
         <translation>Send</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>
 OS CPU Architecture: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation>Subsurface was unable to submit the user survey.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="121"/>
         <source>The following error occurred:</source>
         <translation>The following error occurred:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>Please check your internet connection.</source>
         <translation>Please check your internet connection.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="131"/>
         <source>Survey successfully submitted.</source>
         <translation>Survey successfully submitted.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="136"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -5065,12 +5311,12 @@ OS CPU Architecture: %1</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -5118,12 +5364,12 @@ OS CPU Architecture: %1</translation>
         <translation>Upload</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="247"/>
         <source>Operation timed out</source>
         <translation>Operation timed out</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="268"/>
         <source>Transferring data...</source>
         <translation>Transferring data...</translation>
     </message>
@@ -5131,17 +5377,17 @@ OS CPU Architecture: %1</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Weight</source>
         <translation>Weight</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="496"/>
+        <location filename="../qt-ui/models.cpp" line="500"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Clicking here will remove this weight system.</translation>
     </message>
@@ -5149,19 +5395,19 @@ OS CPU Architecture: %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1479"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1487"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1497"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1555"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1566"/>
         <source>Failed!</source>
         <translation>Failed!</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1506"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1576"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>This feature is not yet available for the selected dive computer.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1580"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Could not a establish connection to the dive computer.</translation>
     </message>
@@ -5169,79 +5415,79 @@ OS CPU Architecture: %1</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1841"/>
+        <location filename="../qt-ui/models.cpp" line="1847"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Year 
  &gt; Month / Trip</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1844"/>
+        <location filename="../qt-ui/models.cpp" line="1850"/>
         <source>#</source>
         <translation>No.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1847"/>
+        <location filename="../qt-ui/models.cpp" line="1853"/>
         <source>Duration 
  Total</source>
         <translation>Duration 
  Total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1850"/>
+        <location filename="../qt-ui/models.cpp" line="1856"/>
         <source>
 Average</source>
         <translation>
 Average</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1853"/>
+        <location filename="../qt-ui/models.cpp" line="1859"/>
         <source>
 Shortest</source>
         <translation>
 Shortest</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1856"/>
+        <location filename="../qt-ui/models.cpp" line="1862"/>
         <source>
 Longest</source>
         <translation>
 Longest</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1859"/>
+        <location filename="../qt-ui/models.cpp" line="1865"/>
         <source>Depth (%1)
  Average</source>
         <translation>Depth (%1)
  Average</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1862"/>
-        <location filename="../qt-ui/models.cpp" line="1871"/>
-        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>
 Minimum</source>
         <translation>
 Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1865"/>
-        <location filename="../qt-ui/models.cpp" line="1874"/>
-        <location filename="../qt-ui/models.cpp" line="1883"/>
+        <location filename="../qt-ui/models.cpp" line="1871"/>
+        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>
 Maximum</source>
         <translation>
 Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1874"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
  Average</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1883"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -5322,40 +5568,40 @@ Maximum</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1508"/>
+        <location filename="../dive.c" line="1530"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) or (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="464"/>
+        <location filename="../divelist.c" line="467"/>
         <location filename="../equipment.c" line="81"/>
-        <location filename="../planner.c" line="1060"/>
-        <location filename="../planner.c" line="1063"/>
+        <location filename="../planner.c" line="1081"/>
+        <location filename="../planner.c" line="1084"/>
         <source>air</source>
         <translation>air</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="192"/>
+        <location filename="../equipment.c" line="194"/>
         <source>integrated</source>
         <translation>integrated</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="193"/>
+        <location filename="../equipment.c" line="195"/>
         <source>belt</source>
         <translation>belt</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="194"/>
+        <location filename="../equipment.c" line="196"/>
         <source>ankle</source>
         <translation>ankle</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="195"/>
+        <location filename="../equipment.c" line="197"/>
         <source>backplate weight</source>
         <translation>backplate weight</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="196"/>
+        <location filename="../equipment.c" line="198"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -5363,7 +5609,7 @@ Maximum</translation>
         <location filename="../file.c" line="112"/>
         <location filename="../file.c" line="434"/>
         <location filename="../file.c" line="506"/>
-        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="925"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Failed to read &apos;%s&apos;</translation>
     </message>
@@ -5420,9 +5666,9 @@ Maximum</translation>
         <translation>No matching DC found for file &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../file.c" line="869"/>
-        <location filename="../file.c" line="909"/>
-        <location filename="../file.c" line="1007"/>
+        <location filename="../file.c" line="870"/>
+        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="1016"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>Maximum number of supported columns on CSV import is %d</translation>
     </message>
@@ -5593,27 +5839,27 @@ Maximum</translation>
         <translation>invalid event number</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="421"/>
+        <location filename="../libdivecomputer.c" line="419"/>
         <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="427"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Error registering the data</source>
         <translation>Error registering data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="433"/>
         <source>Error parsing the datetime</source>
         <translation>Error parsing the date/time</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Dive %d: %s</source>
         <translation>Dive %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="455"/>
+        <location filename="../libdivecomputer.c" line="454"/>
         <source>Error parsing the divetime</source>
         <translation>Error parsing the divetime</translation>
     </message>
@@ -5623,166 +5869,166 @@ Maximum</translation>
         <translation>Error parsing the maxdepth</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="482"/>
+        <location filename="../libdivecomputer.c" line="483"/>
         <source>Error parsing temperature</source>
         <translation>Error parsing temperature</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="501"/>
+        <location filename="../libdivecomputer.c" line="503"/>
         <source>Error parsing the gas mix count</source>
         <translation>Error parsing the gas mix count</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="513"/>
+        <location filename="../libdivecomputer.c" line="515"/>
         <source>Error obtaining water salinity</source>
         <translation>Error obtaining water salinity</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="521"/>
+        <location filename="../libdivecomputer.c" line="524"/>
         <source>Error obtaining surface pressure</source>
         <translation>Error obtaining surface pressure</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="545"/>
+        <location filename="../libdivecomputer.c" line="549"/>
         <source>Error obtaining divemode</source>
         <translation>Error obtaining divemode</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="562"/>
+        <location filename="../libdivecomputer.c" line="569"/>
         <source>Error parsing the gas mix</source>
         <translation>Error parsing the gas mix</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="569"/>
+        <location filename="../libdivecomputer.c" line="576"/>
         <source>Error parsing the samples</source>
         <translation>Error parsing the samples</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="706"/>
+        <location filename="../libdivecomputer.c" line="713"/>
         <source>Event: waiting for user action</source>
         <translation>Event: waiting for user action</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="714"/>
+        <location filename="../libdivecomputer.c" line="721"/>
         <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="778"/>
+        <location filename="../libdivecomputer.c" line="785"/>
         <source>Error registering the event handler.</source>
         <translation>Error registering the event handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="783"/>
+        <location filename="../libdivecomputer.c" line="790"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Error registering the cancellation handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="804"/>
+        <location filename="../libdivecomputer.c" line="811"/>
         <source>Dive data import error</source>
         <translation>Dive data import error</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="843"/>
+        <location filename="../libdivecomputer.c" line="850"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Unable to create libdivecomputer context</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="850"/>
+        <location filename="../libdivecomputer.c" line="857"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Unable to open %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="858"/>
+        <location filename="../libdivecomputer.c" line="865"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Insufficient privileges to open the device %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="506"/>
+        <location filename="../parse-xml.c" line="516"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Strange percentage reading %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1760"/>
+        <location filename="../parse-xml.c" line="1770"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Failed to parse &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1989"/>
-        <location filename="../parse-xml.c" line="2137"/>
+        <location filename="../parse-xml.c" line="1999"/>
+        <location filename="../parse-xml.c" line="2147"/>
         <source>Database query dm4_events failed.
 </source>
         <translation>Database query dm4_events failed.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1996"/>
-        <location filename="../parse-xml.c" line="2144"/>
+        <location filename="../parse-xml.c" line="2006"/>
+        <location filename="../parse-xml.c" line="2154"/>
         <source>Database query dm4_tags failed.
 </source>
         <translation>Database query dm4_tags failed.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2318"/>
+        <location filename="../parse-xml.c" line="2328"/>
         <source>Database query shearwater_cylinders failed.
 </source>
         <translation>Database query shearwater_cylinders failed.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2325"/>
+        <location filename="../parse-xml.c" line="2335"/>
         <source>Database query shearwater_changes failed.
 </source>
         <translation>Database query shearwater_changes failed.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2332"/>
+        <location filename="../parse-xml.c" line="2342"/>
         <source>Database query shearwater_profile_sample failed.
 </source>
         <translation>Database query shearwater_profile_sample failed.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2451"/>
+        <location filename="../parse-xml.c" line="2461"/>
         <source>Database query cobalt_cylinders failed.
 </source>
         <translation>Database query cobalt_cylinders failed.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2458"/>
+        <location filename="../parse-xml.c" line="2468"/>
         <source>Database query cobalt_buddies failed.
 </source>
         <translation>Database query cobalt_buddies failed.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2465"/>
+        <location filename="../parse-xml.c" line="2475"/>
         <source>Database query cobalt_visibility failed.
 </source>
         <translation>Database query cobalt_visibility failed.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2472"/>
+        <location filename="../parse-xml.c" line="2482"/>
         <source>Database query cobalt_location failed.
 </source>
         <translation>Database query cobalt_location failed.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2479"/>
+        <location filename="../parse-xml.c" line="2489"/>
         <source>Database query cobalt_location (site) failed.
 </source>
         <translation>Database query cobalt_location (site) failed.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2486"/>
+        <location filename="../parse-xml.c" line="2496"/>
         <source>Database query cobalt_profile_sample failed.
 </source>
         <translation>Database query cobalt_profile_sample failed.
@@ -5796,17 +6042,17 @@ Maximum</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2168"/>
-        <location filename="../parse-xml.c" line="2189"/>
-        <location filename="../parse-xml.c" line="2508"/>
-        <location filename="../parse-xml.c" line="2527"/>
+        <location filename="../parse-xml.c" line="2178"/>
+        <location filename="../parse-xml.c" line="2199"/>
+        <location filename="../parse-xml.c" line="2518"/>
+        <location filename="../parse-xml.c" line="2537"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Database query failed &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2848"/>
+        <location filename="../parse-xml.c" line="2909"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Can&apos;t open stylesheet %s</translation>
     </message>
@@ -5816,161 +6062,167 @@ Maximum</translation>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="820"/>
+        <location filename="../planner.c" line="841"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Can&apos;t find gas %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="356"/>
+        <location filename="../planner.c" line="363"/>
         <source>Too many gas mixes</source>
         <translation>Too many gas mixes</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="540"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation>Decompression calculation aborted due to excessive time</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="548"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation>based on GFlow = %d and GFhigh = %d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="544"/>
+        <location filename="../planner.c" line="551"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface dive plan</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="548"/>
+        <location filename="../planner.c" line="555"/>
         <source>depth</source>
         <translation>depth</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="558"/>
         <source>runtime</source>
         <translation>runtime</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="554"/>
+        <location filename="../planner.c" line="561"/>
         <source>duration</source>
         <translation>duration</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="557"/>
+        <location filename="../planner.c" line="564"/>
         <source>gas</source>
         <translation>gas</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="594"/>
+        <location filename="../planner.c" line="601"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="602"/>
+        <location filename="../planner.c" line="609"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="615"/>
+        <location filename="../planner.c" line="622"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="622"/>
+        <location filename="../planner.c" line="629"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="635"/>
+        <location filename="../planner.c" line="642"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="638"/>
-        <location filename="../planner.c" line="642"/>
+        <location filename="../planner.c" line="645"/>
+        <location filename="../planner.c" line="649"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="651"/>
+        <location filename="../planner.c" line="658"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="676"/>
+        <location filename="../planner.c" line="683"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Switch gas to %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="678"/>
+        <location filename="../planner.c" line="685"/>
         <source>Switch gas to %s</source>
         <translation>Switch gas to %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="697"/>
+        <location filename="../planner.c" line="704"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="699"/>
+        <location filename="../planner.c" line="706"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="710"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Gas consumption (CCR legs excluded):</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="705"/>
+        <location filename="../planner.c" line="712"/>
         <source>Gas consumption:</source>
         <translation>Gas consumption:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="535"/>
-        <location filename="../planner.c" line="725"/>
-        <location filename="../planner.c" line="730"/>
-        <location filename="../planner.c" line="753"/>
+        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="732"/>
+        <location filename="../planner.c" line="737"/>
+        <location filename="../planner.c" line="762"/>
+        <location filename="../planner.c" line="772"/>
         <source>Warning:</source>
         <translation>Warning:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="523"/>
+        <location filename="../planner.c" line="530"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
         <translation>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="726"/>
+        <location filename="../planner.c" line="733"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>this is more gas than available in the specified cylinder!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="731"/>
+        <location filename="../planner.c" line="738"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>not enough reserve for gas sharing on ascent!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="733"/>
+        <location filename="../planner.c" line="740"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="735"/>
+        <location filename="../planner.c" line="742"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s during planned ascent) of %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="759"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="1064"/>
+        <location filename="../planner.c" line="769"/>
+        <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="1085"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1099"/>
+        <location filename="../profile.c" line="1113"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -5979,70 +6231,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1102"/>
+        <location filename="../profile.c" line="1116"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1106"/>
+        <location filename="../profile.c" line="1120"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1112"/>
+        <location filename="../profile.c" line="1126"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1115"/>
+        <location filename="../profile.c" line="1129"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1117"/>
+        <location filename="../profile.c" line="1131"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1119"/>
+        <location filename="../profile.c" line="1133"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1121"/>
+        <location filename="../profile.c" line="1135"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1123"/>
+        <location filename="../profile.c" line="1137"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1140"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1147"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -6051,7 +6303,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1137"/>
+        <location filename="../profile.c" line="1151"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -6060,149 +6312,149 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1149"/>
+        <location filename="../profile.c" line="1163"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Safety Stop: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1152"/>
+        <location filename="../profile.c" line="1166"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Safety Stop: unkn time @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1157"/>
+        <location filename="../profile.c" line="1171"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1174"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: unkn time @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1178"/>
         <source>In deco
 </source>
         <translation>In deco
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1166"/>
+        <location filename="../profile.c" line="1180"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1183"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1172"/>
+        <location filename="../profile.c" line="1186"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1180"/>
+        <location filename="../profile.c" line="1194"/>
         <source>In deco (calc)
 </source>
         <translation>In deco (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1196"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1185"/>
+        <location filename="../profile.c" line="1199"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1188"/>
+        <location filename="../profile.c" line="1202"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Calculated ceiling %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1194"/>
+        <location filename="../profile.c" line="1208"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Tissue %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1214"/>
         <source>heartbeat: %d
 </source>
         <translation>heartbeat: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1202"/>
+        <location filename="../profile.c" line="1216"/>
         <source>bearing: %d
 </source>
         <translation>bearing: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1205"/>
+        <location filename="../profile.c" line="1219"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>mean depth to here %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1314"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1304"/>
-        <location filename="../profile.c" line="1308"/>
-        <location filename="../profile.c" line="1312"/>
+        <location filename="../profile.c" line="1318"/>
+        <location filename="../profile.c" line="1322"/>
+        <location filename="../profile.c" line="1326"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1316"/>
+        <location filename="../profile.c" line="1330"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1334"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1324"/>
-        <location filename="../profile.c" line="1328"/>
+        <location filename="../profile.c" line="1338"/>
+        <location filename="../profile.c" line="1342"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1335"/>
+        <location filename="../profile.c" line="1349"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -6333,6 +6585,7 @@ EADD: %d%s
     </message>
     <message>
         <location filename="../dive.c" line="30"/>
+        <location filename="../equipment.c" line="85"/>
         <source>oxygen</source>
         <translation>oxygen</translation>
     </message>
@@ -6387,97 +6640,97 @@ EADD: %d%s
         <translation>(no dives)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sun</source>
         <translation>Sun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Mon</source>
         <translation>Mon</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Tue</source>
         <translation>Tue</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Wed</source>
         <translation>Wed</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Thu</source>
         <translation>Thu</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Fri</source>
         <translation>Fri</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sat</source>
         <translation>Sat</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>May</source>
         <translation>May</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Oct</source>
         <translation>Oct</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Dec</source>
         <translation>Dec</translation>
     </message>
@@ -7081,13 +7334,13 @@ Is the Uemis Zurich plugged in correctly?</translation>
         <translation>Planning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
         <source>GF low</source>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>%</source>
         <translation>%</translation>
     </message>
@@ -7097,7 +7350,7 @@ Is the Uemis Zurich plugged in correctly?</translation>
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="335"/>
         <source>Drop to first depth</source>
         <translation>Drop to first depth</translation>
     </message>
@@ -7107,69 +7360,69 @@ Is the Uemis Zurich plugged in correctly?</translation>
         <translation>Last stop at 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
         <source>Plan backgas breaks</source>
         <translation>Plan backgas breaks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="355"/>
         <source>Gas options</source>
         <translation>Gas options</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="376"/>
         <source>Bottom SAC</source>
         <translation>Bottom SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="383"/>
         <source>Deco SAC</source>
         <translation>Deco SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="380"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="390"/>
         <source>Bottom pO₂</source>
         <translation>Bottom pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="403"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="413"/>
         <source>Deco pO₂</source>
         <translation>Deco pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="449"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="462"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="478"/>
         <source>Dive notes</source>
         <translation>Dive notes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
         <source>Display runtime</source>
         <translation>Display runtime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <source>Display segment duration</source>
         <translation>Display segment duration</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="531"/>
         <source>Display transitions in deco</source>
         <translation>Display transitions in deco</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="538"/>
         <source>Verbatim dive plan</source>
         <translation>Verbatim dive plan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="387"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="410"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="397"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -7189,17 +7442,17 @@ Is the Uemis Zurich plugged in correctly?</translation>
         <translation>6m to surface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="499"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>In dive plan, show runtime (absolute time) of stops</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="515"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>In dive plan, show duration (relative time) of stops</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>In dive plan, list transitions or treat them as implicit</translation>
     </message>
diff --git a/translations/subsurface_es_ES.ts b/translations/subsurface_es_ES.ts
index 4965a006e..36ee70b9d 100644
--- a/translations/subsurface_es_ES.ts
+++ b/translations/subsurface_es_ES.ts
@@ -3,12 +3,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="539"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="522"/>
         <source>Person: </source>
         <translation>Persona:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="540"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="523"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Busca por compañeros y divemasters</translation>
     </message>
@@ -16,40 +16,188 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="233"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="230"/>
         <source>No buddies</source>
         <translation>Sin compañeros</translation>
     </message>
 </context>
 <context>
+    <name>ColumnNameProvider</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>GPS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Avg depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="210"/>
+        <location filename="../configuredivecomputer.cpp" line="212"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation>No se pudo guardar copia de seguridad del archivo %1. Mensaje de error: %2</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="226"/>
+        <location filename="../configuredivecomputer.cpp" line="228"/>
         <source>Could not open backup file: %1</source>
         <translation>No se pudo abrir la copia de seguridad: %1</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="542"/>
+        <location filename="../configuredivecomputer.cpp" line="552"/>
         <source>Dive computer details read successfully</source>
         <translation>Detalles del ordenador leídos correctamente</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="551"/>
+        <location filename="../configuredivecomputer.cpp" line="561"/>
         <source>Setting successfully written to device</source>
         <translation>Ajuste grabado correctamente en el dispositivo</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="560"/>
+        <location filename="../configuredivecomputer.cpp" line="570"/>
         <source>Device firmware successfully updated</source>
         <translation>Firmware del dispositivo actualizado con éxito</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="569"/>
+        <location filename="../configuredivecomputer.cpp" line="579"/>
         <source>Device settings successfully reset</source>
         <translation>Ajustes del dispositivo reiniciados con exito</translation>
     </message>
@@ -847,72 +995,72 @@
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1053"/>
         <source>Backup files (*.xml)</source>
         <translation>Archivos de copia de seguridad (*.xml)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1037"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>Sucedió un error al guardar la copia de seguridad.
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1040"/>
         <source>Backup succeeded</source>
         <translation>Copia de seguridad correcta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1041"/>
         <source>Your settings have been saved to: %1</source>
         <translation>Se han guardado los ajustes en: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1030"/>
         <source>Backup dive computer settings</source>
         <translation>Hacer copia de seguridad de los ajustes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1036"/>
         <source>XML backup error</source>
         <translation>Error en la copia de seguridad XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1052"/>
         <source>Restore dive computer settings</source>
         <translation>Recuperar ajustes del ordenador de buceo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1056"/>
         <source>XML restore error</source>
         <translation>Error al recuperar el XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1057"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>Ocurrió un error al recuperar la copia de seguridad.
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1063"/>
         <source>Restore succeeded</source>
         <translation>Recuperación correcta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1064"/>
         <source>Your settings have been restored successfully.</source>
         <translation>Los ajustes se han recuperado correctamente.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1074"/>
         <source>Select firmware file</source>
         <translation>Seleccionar archivo de firmware</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1075"/>
         <source>All files (*.*)</source>
         <translation>Todos los archivos (*.*)</translation>
     </message>
@@ -970,12 +1118,12 @@
         <translation>Pulsar aquí borrará esta botella</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="410"/>
         <source>Cylinder cannot be removed</source>
         <translation>La botella no puede borrarse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="407"/>
+        <location filename="../qt-ui/models.cpp" line="411"/>
         <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>
@@ -1052,12 +1200,12 @@ Este gas se está usando. Solo se pueden borrar botellas que no se usen en la in
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="48"/>
         <source>Remove the selected dive computer?</source>
         <translation>¿Borrar el ordenador de buceo seleccionado?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="49"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
         <translation>¿Está seguro de que quiere eliminar 
@@ -1072,22 +1220,22 @@ el ordenador de buceo seleccionado?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Model</source>
         <translation>Modelo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Device ID</source>
         <translation>ID del dispositivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Nickname</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Hacer clic aquí borrará este ordenador de buceo.</translation>
     </message>
@@ -1095,117 +1243,145 @@ el ordenador de buceo seleccionado?</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="115"/>
         <source>Bailing out to OC</source>
         <translation>Cambio de emergencia a OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="117"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>comienzo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>fin</translation>
     </message>
 </context>
 <context>
+    <name>DiveImportedModel</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="556"/>
+        <source>Date/time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
+        <source>Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>h:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>min</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1242"/>
+        <location filename="../qt-ui/models.cpp" line="1248"/>
         <source>#</source>
         <translation>N.º</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1245"/>
+        <location filename="../qt-ui/models.cpp" line="1251"/>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1248"/>
+        <location filename="../qt-ui/models.cpp" line="1254"/>
         <source>Rating</source>
         <translation>Valoración</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Depth(%1)</source>
         <translation>Prof.(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1254"/>
+        <location filename="../qt-ui/models.cpp" line="1260"/>
         <source>Duration</source>
         <translation>Duración</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1263"/>
         <source>Temp(%1%2)</source>
         <translation>Temp(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>Weight(%1)</source>
         <translation>Lastre(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1263"/>
+        <location filename="../qt-ui/models.cpp" line="1269"/>
         <source>Suit</source>
         <translation>Traje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1266"/>
+        <location filename="../qt-ui/models.cpp" line="1272"/>
         <source>Cyl</source>
         <translation>Bot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1269"/>
+        <location filename="../qt-ui/models.cpp" line="1275"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>SAC(%1)</source>
         <translation>CAS(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1277"/>
+        <location filename="../qt-ui/models.cpp" line="1283"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1280"/>
+        <location filename="../qt-ui/models.cpp" line="1286"/>
         <source>Max CNS</source>
         <translation>CNS máximo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1283"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>Location</source>
         <translation>Ubicación</translation>
     </message>
@@ -1213,87 +1389,87 @@ el ordenador de buceo seleccionado?</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="787"/>
+        <location filename="../qt-ui/divelistview.cpp" line="768"/>
         <source>Expand all</source>
         <translation>Expandir todos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="788"/>
+        <location filename="../qt-ui/divelistview.cpp" line="769"/>
         <source>Collapse all</source>
         <translation>Contraer todo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="789"/>
+        <location filename="../qt-ui/divelistview.cpp" line="770"/>
         <source>Collapse others</source>
         <translation>Contraer otras</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="791"/>
+        <location filename="../qt-ui/divelistview.cpp" line="772"/>
         <source>Remove dive(s) from trip</source>
         <translation>Borrar inmersión(es) del viaje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="792"/>
+        <location filename="../qt-ui/divelistview.cpp" line="773"/>
         <source>Create new trip above</source>
         <translation>Crear nuevo viaje por encima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="806"/>
+        <location filename="../qt-ui/divelistview.cpp" line="787"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Añadir inmersión(es) al viaje de arriba</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="808"/>
+        <location filename="../qt-ui/divelistview.cpp" line="789"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Añadir inmersión(es) al viaje de debajo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="812"/>
+        <location filename="../qt-ui/divelistview.cpp" line="793"/>
         <source>Merge trip with trip above</source>
         <translation>Combinar viaje con el viaje de encima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="813"/>
+        <location filename="../qt-ui/divelistview.cpp" line="794"/>
         <source>Merge trip with trip below</source>
         <translation>Combinar viaje con el viaje de abajo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="817"/>
+        <location filename="../qt-ui/divelistview.cpp" line="798"/>
         <source>Delete dive(s)</source>
         <translation>Borrar inmersión(es)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="819"/>
+        <location filename="../qt-ui/divelistview.cpp" line="800"/>
         <source>Mark dive(s) invalid</source>
         <translation>Marcar inmersión(es) como no válida(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="823"/>
+        <location filename="../qt-ui/divelistview.cpp" line="804"/>
         <source>Merge selected dives</source>
         <translation>Mezclar las inmersiones seleccionadas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="825"/>
+        <location filename="../qt-ui/divelistview.cpp" line="806"/>
         <source>Renumber dive(s)</source>
         <translation>Renumerar inmersiones</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="826"/>
+        <location filename="../qt-ui/divelistview.cpp" line="807"/>
         <source>Shift times</source>
         <translation>Desplazar horas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="827"/>
+        <location filename="../qt-ui/divelistview.cpp" line="808"/>
         <source>Load images</source>
         <translation>Cargar imágenes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Open image files</source>
         <translation>Abrir archivos de imagen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Archivos de imagen (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -1478,100 +1654,100 @@ el ordenador de buceo seleccionado?</translation>
         <translation>Arena</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>Archivos UDDF (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="268"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>Archivos CSV (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="68"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Formato genérico que se utiliza para intercambio de datos entre programas relacionados con el buceo.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>Valores separados por comas que describen el perfil de buceo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation>Valores separados por comas de la información del buceo. Aquí se incluyen la mayoría de los detalles pero no la información del perfil.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Enviar los datos de buceo a la web de divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>Enviar los datos de buceo al sitio web dive-share.appspot.com</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>Exporta las ubicaciones de buceo en HTML, visualizándolas en un mapa mundial.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
         <source>Subsurface native XML format.</source>
         <translation>Formato XML nativo de Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
         <source>Write depths of images to file.</source>
         <translation>Escribir la profundidad de las imágenes a archivo.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export UDDF file as</source>
         <translation>Exportar archivo UDDF como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="267"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
         <source>Export CSV file as</source>
         <translation>Exportar archivo CSV como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="278"/>
         <source>Export world map</source>
         <translation>Exportar Mapamundi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="299"/>
         <source>HTML files (*.html)</source>
         <translation>Archivos HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="283"/>
         <source>Export Subsurface XML</source>
         <translation>Exportar a XML de Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="284"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>Archivos XML (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
         <source>Save image depths</source>
         <translation>Guardar profundidades de las imágenes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="298"/>
         <source>Export HTML files as</source>
         <translation>Exportar archivos HTML como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
         <source>Can&apos;t open file %s</source>
         <translation>No se puede abrir el archivo %s</translation>
     </message>
@@ -1584,248 +1760,228 @@ el ordenador de buceo seleccionado?</translation>
         <translation>Importar archivo de registro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
-        <source>CSV options</source>
-        <translation>Opciones de CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="281"/>
-        <source>Pre-configured imports</source>
-        <translation>Importaciones pre-configuradas</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="122"/>
-        <source>Depth</source>
-        <translation>Profundidad</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="142"/>
-        <source>Stopdepth</source>
-        <translation>Profundidad de parada</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="162"/>
-        <source>Pressure</source>
-        <translation>Presión</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="176"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="466"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
         <source>Time</source>
         <translation>Hora de entrada</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="183"/>
-        <source>Temp</source>
-        <translation>Temp</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="213"/>
-        <source>NDL</source>
-        <translation>LND</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="233"/>
-        <source>TTS</source>
-        <translation>TTS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="253"/>
-        <source>Cns</source>
-        <translation>Cns</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="58"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="789"/>
-        <source>Field separator</source>
-        <translation>Separador de campos</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="35"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="363"/>
-        <source>Units</source>
-        <translation>Unidades</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="42"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="370"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="97"/>
         <source>Metric</source>
         <translation>Métrico</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="47"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="375"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="102"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="169"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="298"/>
-        <source>Manual dives</source>
-        <translation>Inmersiones manuales</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="316"/>
-        <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source>
-        <translation>Elige el orden de día, mes y año para el formato de la fecha. El separador de campos puede ser cualquiera de los siguientes caracteres  .-/. </translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="319"/>
-        <source>Date format</source>
-        <translation>Formato de fecha</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="332"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="59"/>
         <source>dd.mm.yyyy</source>
         <translation>dd.mm.aaaa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="337"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="64"/>
         <source>mm/dd/yyyy</source>
         <translation>mm/dd/aaaa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="342"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="69"/>
         <source>yyyy-mm-dd</source>
         <translation>aaaa-mm-dd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="392"/>
-        <source>Dive #</source>
-        <translation>Inmersión #</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="426"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="439"/>
-        <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source>
-        <translation>Fecha en formato dd.mm.aaaa, aaaa-mm-dd o mm/dd/aaaa</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+        <source>Dive #</source>
+        <translation>Inmersión #</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="429"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="500"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="513"/>
-        <source>Dive duration in seconds or in min:sec format</source>
-        <translation>Duración del buceo en segundos o en formato min:seg</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="503"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
         <source>Duration</source>
         <translation>Duración</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="574"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="591"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
         <source>Tags</source>
         <translation>Etiquetas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="608"/>
-        <source>Cyl size</source>
-        <translation>Tamaño de botella</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="625"/>
-        <source>Air temp</source>
-        <translation>Temperatura del aire</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="642"/>
-        <source>Start Pressure</source>
-        <translation>Presión inicial</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="659"/>
-        <source>Water temp</source>
-        <translation>Temperatura del agua</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="676"/>
-        <source>End Press</source>
-        <translation>Presión final</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="693"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
         <source>O₂</source>
         <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="710"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
         <source>He</source>
         <translation>He</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="742"/>
-        <source>Choose duration format.</source>
-        <translation>Elegir formato de la duración.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="745"/>
-        <source>Duration format</source>
-        <translation>Formato de la duración</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="758"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="78"/>
         <source>Seconds</source>
         <translation>Segundos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="763"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
         <source>Minutes</source>
         <translation>Minutos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="768"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="88"/>
         <source>Minutes:seconds</source>
         <translation>Minutos:segundos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="540"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
         <source>Location</source>
         <translation>Ubicación</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="409"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
         <source>Max depth</source>
         <translation>Profundidad máxima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="386"/>
-        <source>Field configuration</source>
-        <translation>Configuración de campos</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+        <source>Tab</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+        <source>Samples pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
         <source>Mean depth</source>
         <translation>Profundidad media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="483"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
         <source>Buddy</source>
         <translation>Compañero</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="523"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="557"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DivePlanner</name>
@@ -1868,42 +2024,42 @@ el ordenador de buceo seleccionado?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
         <source>unknown</source>
         <translation>desconocido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="691"/>
         <source>Final depth</source>
         <translation>Profundidad final</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="693"/>
         <source>Run time</source>
         <translation>Tiempo acumulado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="701"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="695"/>
         <source>Duration</source>
         <translation>Duración</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="703"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
         <source>Used gas</source>
         <translation>Gas usado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="705"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
         <source>CC set point</source>
         <translation>CC Set Point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1044"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1051"/>
         <source>Discard the plan?</source>
         <translation>¿Descartar el plan?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1045"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1052"/>
         <source>You are about to discard your plan.</source>
         <translation>Está a punto de descartar su plan.</translation>
     </message>
@@ -1911,22 +2067,22 @@ el ordenador de buceo seleccionado?</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="257"/>
         <source>Dive planner points</source>
         <translation>Puntos del planificador de inmersiones</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="261"/>
         <source>Available gases</source>
         <translation>Gases disponibles</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="284"/>
         <source>Add dive data point</source>
         <translation>Añadir punto de datos de inmersión.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="304"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="293"/>
         <source>Save new</source>
         <translation>Guardar nueva</translation>
     </message>
@@ -1934,92 +2090,112 @@ el ordenador de buceo seleccionado?</translation>
 <context>
     <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Depth</source>
         <translation>Profundidad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
         <source>Time</source>
         <translation>Hora de entrada</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
         <source>Pressure</source>
         <translation>Presión</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
         <source>Color</source>
         <translation>Color</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
         <source>Pressure S</source>
         <translation>Presión S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
+        <source>Setpoint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
+        <source>Sensor1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
+        <source>Sensor2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
+        <source>Sensor3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
         <source>Ambient pressure</source>
         <translation>Presión ambiental</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
-        <source>Heart Beat</source>
-        <translation>Ritmo cardiaco</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
+        <source>Heart beat</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
-        <source>Gradient Factor</source>
-        <translation>Factor de gradiente</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/>
+        <source>Gradient factor</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
-        <source>Mean Depth/s</source>
-        <translation>Profundidad/es media/s</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
+        <source>Mean depth/s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
         <source>Pressure I</source>
         <translation>Presión I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
         <source>User entered</source>
         <translation>Introducido por el usuario</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
         <source>Cylinder index</source>
         <translation>Índice de botellas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
         <source>Ceiling</source>
         <translation>Techo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
         <source>SAC</source>
         <translation>CAS</translation>
     </message>
@@ -2070,127 +2246,127 @@ el ordenador de buceo seleccionado?</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1437"/>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1443"/>
+        <location filename="../qt-ui/models.cpp" line="1489"/>
         <source>#</source>
         <translation>N.º</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1440"/>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1492"/>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1443"/>
-        <location filename="../qt-ui/models.cpp" line="1489"/>
+        <location filename="../qt-ui/models.cpp" line="1449"/>
+        <location filename="../qt-ui/models.cpp" line="1495"/>
         <source>Rating</source>
         <translation>Valoración</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1452"/>
         <source>Depth</source>
         <translation>Prof.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1458"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1461"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>SAC</source>
         <translation>CAS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>Weight(%1)</source>
         <translation>Lastre(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1458"/>
-        <location filename="../qt-ui/models.cpp" line="1504"/>
+        <location filename="../qt-ui/models.cpp" line="1464"/>
+        <location filename="../qt-ui/models.cpp" line="1510"/>
         <source>Suit</source>
         <translation>Traje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1461"/>
-        <location filename="../qt-ui/models.cpp" line="1507"/>
+        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1513"/>
         <source>Cyl</source>
         <translation>Bot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1464"/>
-        <location filename="../qt-ui/models.cpp" line="1510"/>
+        <location filename="../qt-ui/models.cpp" line="1470"/>
+        <location filename="../qt-ui/models.cpp" line="1516"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>SAC(%1)</source>
         <translation>CAS(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1473"/>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1527"/>
         <source>Max CNS</source>
         <translation>CNS máximo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
-        <location filename="../qt-ui/models.cpp" line="1524"/>
+        <location filename="../qt-ui/models.cpp" line="1482"/>
+        <location filename="../qt-ui/models.cpp" line="1530"/>
         <source>Location</source>
         <translation>Ubicación</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>Depth(%1)</source>
         <translation>Prof.(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1449"/>
-        <location filename="../qt-ui/models.cpp" line="1495"/>
+        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1501"/>
         <source>Duration</source>
         <translation>Duración</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1498"/>
+        <location filename="../qt-ui/models.cpp" line="1504"/>
         <source>Temp(%1%2)</source>
         <translation>Temp(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1470"/>
-        <location filename="../qt-ui/models.cpp" line="1518"/>
+        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1524"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -2198,95 +2374,95 @@ el ordenador de buceo seleccionado?</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="98"/>
         <source>no dives were selected</source>
         <translation>No se seleccionó ninguna inmersión</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="117"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>Fallo al crear archivo .zip para subir: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="143"/>
         <source>cannot create temporary file: %s</source>
         <translation>No puedo crear archivo temporal: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/>
         <source>internal error: %s</source>
         <translation>Error interno: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="169"/>
         <source>internal error</source>
         <translation>Error interno</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="629"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="828"/>
         <source>Done</source>
         <translation>Hecho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/>
         <source>Uploading dive list...</source>
         <translation>Subiendo lista de inmersiones…</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="692"/>
         <source>Downloading dive list...</source>
         <translation>Descargando lista de inmersiones…</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="741"/>
         <source>Downloading %1 dives...</source>
         <translation>Descargando %1 inmersiones…</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="785"/>
         <source>Download finished - %1</source>
         <translation>Descarga finalizada - </translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="802"/>
         <source>Corrupted download</source>
         <translation>Descarga corrompida</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>El archivo no pudo abrirse
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
         <source>Upload failed</source>
         <translation>La subida ha fallado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/>
         <source>Upload successful</source>
         <translation>Subida correcta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
         <source>Login failed</source>
         <translation>El acceso ha fallado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
         <source>Cannot parse response</source>
         <translation>No se puede leer la respuesta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
         <source>Error: %1</source>
         <translation>Error: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="829"/>
         <source>Upload finished</source>
         <translation>Subida finalizada</translation>
     </message>
@@ -2294,54 +2470,52 @@ el ordenador de buceo seleccionado?</translation>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="169"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="400"/>
         <source>Retry</source>
         <translation>Intentar de nuevo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="264"/>
         <source>Find Uemis dive computer</source>
         <translation>Encontrar ordenador de buceo Uemis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Selecciona archivo para registro de descarga de libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Log files (*.log)</source>
         <translation>Archivos Log (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="362"/>
         <source>Warning</source>
         <translation>Advertencia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="363"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>Guardar el volcado de libdivecomputer NO descargará buceos a la lista de inmersiones.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="374"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Selecciona archivo para el volcado binario del ordenador de buceo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="375"/>
         <source>Dump files (*.bin)</source>
         <translation>Archivos de volcado (*.bin)</translation>
     </message>
@@ -2349,7 +2523,7 @@ el ordenador de buceo seleccionado?</translation>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="101"/>
         <source>Vendor</source>
         <translation>Proveedor</translation>
     </message>
@@ -2359,54 +2533,74 @@ el ordenador de buceo seleccionado?</translation>
         <translation>Descargar desde el ordenador de Buceo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="31"/>
         <source>Device or mount point</source>
         <translation>Dispositivo o punto de montaje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="111"/>
         <source>Dive computer</source>
         <translation>Ordenador de buceo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="132"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="45"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="80"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="94"/>
         <source>...</source>
         <translation>…</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="52"/>
         <source>Force download of all dives</source>
         <translation>Forzar descarga de todas las inmersiones</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
         <source>Always prefer downloaded dives</source>
         <translation>Preferir siempre las inmersiones descargadas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
         <source>OK</source>
         <translation>Aceptar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="189"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/>
+        <source>Downloaded Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
+        <source>Select all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
+        <source>Unselect all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
         <source>Save libdivecomputer logfile</source>
         <translation>Guardar registro de libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="87"/>
         <source>Save libdivecomputer dumpfile</source>
         <translation>Guardar volcado de libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
         <source>Download into new trip</source>
         <translation>Descargar a un nuevo viaje</translation>
     </message>
@@ -2414,12 +2608,12 @@ el ordenador de buceo seleccionado?</translation>
 <context>
     <name>ExtraDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Key</source>
         <translation>Clave</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Value</source>
         <translation>Valor</translation>
     </message>
@@ -2433,22 +2627,20 @@ el ordenador de buceo seleccionado?</translation>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="245"/>
-        <source>Your dive profile was updated to facebook.</source>
-        <translation>El perfil de la inmersión se ha subido a Facebook</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
-        <source>Photo Upload Failed</source>
-        <translation>La subida de fotos ha fallado</translation>
+        <source>Your dive profile was updated to Facebook.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="250"/>
-        <source>Your dive profile was not updated to facebook, 
+        <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
-        <translation>El perfil de inmersión no se ha subido a Facebook,
-por favor envía lo siguiente al equipo de desarrollo.
-</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+        <source>Photo Upload Failed</source>
+        <translation>La subida de fotos ha fallado</translation>
     </message>
 </context>
 <context>
@@ -2490,17 +2682,17 @@ por favor envía lo siguiente al equipo de desarrollo.
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1544"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1621"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Esta función no está disponible, todavía, para el ordenador seleccionado</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1624"/>
         <source>Firmware update failed!</source>
         <translation>¡ Ha fallado la actualización de firmware !</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1550"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1627"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>No se pudo establecer conexión con el ordenador de buceo.</translation>
     </message>
@@ -2508,7 +2700,7 @@ por favor envía lo siguiente al equipo de desarrollo.
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="128"/>
+        <location filename="../qt-ui/globe.cpp" line="119"/>
         <source>Edit selected dive locations</source>
         <translation>Editar los puntos de buceo seleccionados.</translation>
     </message>
@@ -2516,7 +2708,7 @@ por favor envía lo siguiente al equipo de desarrollo.
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="566"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="549"/>
         <source>Location: </source>
         <translation>Ubicación:</translation>
     </message>
@@ -2524,7 +2716,7 @@ por favor envía lo siguiente al equipo de desarrollo.
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="286"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="283"/>
         <source>No location set</source>
         <translation>Sin localización</translation>
     </message>
@@ -2532,330 +2724,335 @@ por favor envía lo siguiente al equipo de desarrollo.
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="133"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
+        <location filename="../qt-ui/maintab.cpp" line="497"/>
         <source>Location</source>
         <translation>Ubicación</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="67"/>
         <source>Coordinates</source>
         <translation>Coordenadas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="169"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="154"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Buddy</source>
         <translation>Compañero</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="222"/>
+        <location filename="../qt-ui/maintab.ui" line="277"/>
         <source>Tags</source>
         <translation>Etiquetas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="186"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
         <source>Rating</source>
         <translation>Valoración</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="221"/>
         <source>Visibility</source>
         <translation>Visibilidad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="230"/>
         <source>Suit</source>
         <translation>Traje</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="465"/>
+        <location filename="../qt-ui/maintab.cpp" line="470"/>
         <source>Dive notes</source>
         <translation>Notas de la inmersión</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
-        <location filename="../qt-ui/maintab.ui" line="648"/>
-        <location filename="../qt-ui/maintab.cpp" line="277"/>
+        <location filename="../qt-ui/maintab.ui" line="74"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="102"/>
+        <location filename="../qt-ui/maintab.ui" line="677"/>
+        <location filename="../qt-ui/maintab.cpp" line="279"/>
         <source>Air temp.</source>
         <translation>Temperatura del aire</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <location filename="../qt-ui/maintab.ui" line="667"/>
-        <location filename="../qt-ui/maintab.cpp" line="278"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.ui" line="696"/>
+        <location filename="../qt-ui/maintab.cpp" line="280"/>
         <source>Water temp.</source>
         <translation>Temperatura del agua</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="229"/>
-        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.ui" line="284"/>
+        <location filename="../qt-ui/maintab.cpp" line="498"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="369"/>
+        <location filename="../qt-ui/maintab.ui" line="398"/>
         <source>Equipment</source>
         <translation>Equipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="496"/>
+        <location filename="../qt-ui/maintab.ui" line="525"/>
         <source>Gases used</source>
         <translation>Gases usados</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="515"/>
+        <location filename="../qt-ui/maintab.ui" line="544"/>
         <source>Gas consumed</source>
         <translation>Gas consumido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="553"/>
+        <location filename="../qt-ui/maintab.ui" line="582"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="591"/>
+        <location filename="../qt-ui/maintab.ui" line="620"/>
         <source>Max. depth</source>
         <translation>Prof. máxima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="629"/>
+        <location filename="../qt-ui/maintab.ui" line="658"/>
         <source>Air pressure</source>
         <translation>Presión atmosférica</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="686"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>Dive time</source>
         <translation>Duración de la inmersión</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="845"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
         <source>Total time</source>
         <translation>Tiempo total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="903"/>
+        <location filename="../qt-ui/maintab.ui" line="932"/>
         <source>Gas consumption</source>
         <translation>Consumo de gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="962"/>
+        <location filename="../qt-ui/maintab.ui" line="991"/>
         <source>Extra data</source>
         <translation>Otros datos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="968"/>
+        <location filename="../qt-ui/maintab.ui" line="997"/>
         <source>Additional data from dive computer</source>
         <translation>Datos adicionales del ordenador de buceo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="54"/>
-        <location filename="../qt-ui/maintab.ui" line="458"/>
+        <location filename="../qt-ui/maintab.ui" line="83"/>
+        <location filename="../qt-ui/maintab.ui" line="487"/>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="61"/>
+        <location filename="../qt-ui/maintab.ui" line="90"/>
         <source>Time</source>
         <translation>Hora de entrada</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="425"/>
+        <location filename="../qt-ui/maintab.ui" line="454"/>
         <source>Dive info</source>
         <translation>Información de la inmersión</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="477"/>
+        <location filename="../qt-ui/maintab.ui" line="506"/>
         <source>Interval</source>
         <translation>Intervalo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="534"/>
-        <location filename="../qt-ui/maintab.ui" line="799"/>
+        <location filename="../qt-ui/maintab.ui" line="563"/>
+        <location filename="../qt-ui/maintab.ui" line="828"/>
         <source>SAC</source>
         <translation>CAS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="610"/>
+        <location filename="../qt-ui/maintab.ui" line="639"/>
         <source>Avg. depth</source>
         <translation>Prof. media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="572"/>
+        <location filename="../qt-ui/maintab.ui" line="601"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="734"/>
         <source>Salinity</source>
         <translation>Salinidad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="742"/>
+        <location filename="../qt-ui/maintab.ui" line="771"/>
         <source>Stats</source>
         <translation>Estadísticas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="775"/>
+        <location filename="../qt-ui/maintab.ui" line="804"/>
         <source>Depth</source>
         <translation>Profundidad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="787"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="813"/>
+        <location filename="../qt-ui/maintab.ui" line="842"/>
         <source>Duration</source>
         <translation>Duración</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="864"/>
+        <location filename="../qt-ui/maintab.ui" line="893"/>
         <source>Dives</source>
         <translation>Inmersiones</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="948"/>
+        <location filename="../qt-ui/maintab.ui" line="977"/>
         <source>Photos</source>
         <translation>Fotos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="95"/>
+        <location filename="../qt-ui/maintab.cpp" line="87"/>
         <source>Cylinders</source>
         <translation>Botellas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="99"/>
+        <location filename="../qt-ui/maintab.cpp" line="91"/>
         <source>Weights</source>
         <translation>Lastre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="55"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Apply changes</source>
         <translation>Aplicar cambios</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="59"/>
+        <location filename="../qt-ui/maintab.cpp" line="50"/>
         <source>Discard changes</source>
         <translation>Descartar cambios</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="96"/>
+        <location filename="../qt-ui/maintab.cpp" line="88"/>
         <source>Add cylinder</source>
         <translation>Añadir botella</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="100"/>
+        <location filename="../qt-ui/maintab.cpp" line="92"/>
         <source>Add weight system</source>
         <translation>Añadir sistema de lastre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="274"/>
+        <location filename="../qt-ui/maintab.cpp" line="276"/>
         <source>Air temp. [%1]</source>
         <translation>Temp. aire [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="275"/>
+        <location filename="../qt-ui/maintab.cpp" line="277"/>
         <source>Water temp. [%1]</source>
         <translation>Temp. agua [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="312"/>
+        <location filename="../qt-ui/maintab.cpp" line="314"/>
         <source>This trip is being edited.</source>
         <translation>Este viaje está siendo editado.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="320"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Multiple dives are being edited.</source>
         <translation>Se están editando varias inmersiones.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.cpp" line="324"/>
         <source>This dive is being edited.</source>
         <translation>Esta inmersión esta siendo editada.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="436"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
+        <location filename="../qt-ui/maintab.cpp" line="465"/>
         <source>Trip notes</source>
         <translation>Notas del viaje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="458"/>
+        <location filename="../qt-ui/maintab.cpp" line="463"/>
         <source>Trip location</source>
         <translation>Ubicación del viaje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="526"/>
-        <location filename="../qt-ui/maintab.cpp" line="558"/>
-        <location filename="../qt-ui/maintab.cpp" line="562"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
         <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="574"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="555"/>
+        <location filename="../qt-ui/maintab.cpp" line="563"/>
         <source>Deepest dive</source>
         <translation>Inmersión más profunda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="556"/>
+        <location filename="../qt-ui/maintab.cpp" line="564"/>
         <source>Shallowest dive</source>
         <translation>Inmersión más superficial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="569"/>
+        <location filename="../qt-ui/maintab.cpp" line="577"/>
         <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="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="578"/>
         <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="571"/>
+        <location filename="../qt-ui/maintab.cpp" line="579"/>
         <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="582"/>
+        <location filename="../qt-ui/maintab.cpp" line="590"/>
         <source>Highest temperature</source>
         <translation>Temperatura más alta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="583"/>
+        <location filename="../qt-ui/maintab.cpp" line="591"/>
         <source>Lowest temperature</source>
         <translation>Temperatura más baja</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="584"/>
+        <location filename="../qt-ui/maintab.cpp" line="592"/>
         <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="594"/>
+        <location filename="../qt-ui/maintab.cpp" line="602"/>
         <source>Longest dive</source>
         <translation>Inmersión más larga</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="595"/>
+        <location filename="../qt-ui/maintab.cpp" line="603"/>
         <source>Shortest dive</source>
         <translation>Inmersión más corta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="596"/>
+        <location filename="../qt-ui/maintab.cpp" line="604"/>
         <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="620"/>
+        <location filename="../qt-ui/maintab.cpp" line="628"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -2864,17 +3061,17 @@ a partir de aire y usando:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="624"/>
+        <location filename="../qt-ui/maintab.cpp" line="632"/>
         <source> and </source>
         <translation>y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="911"/>
+        <location filename="../qt-ui/maintab.cpp" line="925"/>
         <source>Discard the changes?</source>
         <translation>¿ Descartar los cambios ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="912"/>
+        <location filename="../qt-ui/maintab.cpp" line="926"/>
         <source>You are about to discard your changes.</source>
         <translation>Estás a punto de descartar tus cambios.</translation>
     </message>
@@ -3021,7 +3218,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="296"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="232"/>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
@@ -3381,90 +3578,90 @@ p, li { white-space: pre-wrap; }
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="252"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="229"/>
         <source>Open file</source>
         <translation>Abrir archivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="256"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="233"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="332"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="309"/>
         <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="444"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
         <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="491"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
         <source>Print runtime table</source>
         <translation>Imprimir tabla de tiempo acumulado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="834"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="811"/>
         <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="836"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="813"/>
         <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="841"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="818"/>
         <source>Save changes?</source>
         <translation>¿Guardar cambios?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1196"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1173"/>
         <source>Save file as</source>
         <translation>Guardar archivo como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1337"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1314"/>
         <source>Open dive log file</source>
         <translation>Abrir archivo de registro de inmersiones</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="819"/>
         <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="300"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="444"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="277"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Warning</source>
         <translation>Advertencia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1180"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1157"/>
         <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="625"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="602"/>
         <source>Yearly statistics</source>
         <translation>Estadísticas anuales</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1197"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1174"/>
         <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="1338"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1315"/>
         <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source>
         <translation>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Archivos Cochran (*.can);;Archivos CSV (*.csv);;Archivos DiveLog.de (*.dld);;Archivos JDiveLog (*.jlb);;Archivos Liquivision (*.lvd);;Archivos MkVI (*.txt);;Archivos Suunto (*.sde *.db);;Archivos Divesoft (*.dlf);;Archivos UDDF/UDCF (*.uddf *.udcf);;Archivos XML (*.xml);;Todos los archivos (*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <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>
@@ -3472,7 +3669,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="651"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="634"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Los filtros muestran %1 (de %2) inmersiones</translation>
     </message>
@@ -3480,12 +3677,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="239"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation>Se debería actualizar el firmware del ordenador de buceo: La versión actual es %1 pero la última versión estable es %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="243"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
@@ -3494,27 +3691,27 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos que para descargar, antes de seguir con la actualización</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="244"/>
         <source>Not now</source>
         <translation>Ahora no</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="245"/>
         <source>Update firmware</source>
         <translation>Actualizar firmware</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
         <source>Firmware upgrade notice</source>
         <translation>Aviso de actualización del firmware</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
         <source>Save the downloaded firmware as</source>
         <translation>Guardar el firmware descargado como </translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
         <source>HEX files (*.hex)</source>
         <translation>Archivos HEX (*.hex)</translation>
     </message>
@@ -3522,54 +3719,69 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Open circuit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="481"/>
         <source>Last stop at 20ft</source>
         <translation>Última parada a 20pies</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="482"/>
         <source>50% avg. depth to 20ft</source>
         <translation>De 50% de prof. media a 20 pies</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="489"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
         <source>20ft to surface</source>
         <translation>De 20 pies a superficie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="485"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
         <source>Last stop at 6m</source>
         <translation>Última parada a 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
         <source>50% avg. depth to 6m</source>
         <translation>De 50% prof. media a 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="494"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
         <source>6m to surface</source>
         <translation>De 6m a superficie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="497"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="498"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
         <source>cuft/min</source>
         <translation>pies3/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="506"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="507"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="500"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="501"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
@@ -3688,6 +3900,7 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="816"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -3722,57 +3935,87 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="795"/>
+        <source>CCR: Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="809"/>
+        <source>Default CCR set-point for dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="832"/>
+        <source>pSCR O₂ metabolism rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="839"/>
+        <source>pSCR ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="846"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="859"/>
+        <source>1:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="875"/>
         <source>System default</source>
         <translation>Predeterminado del sistema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="843"/>
+        <location filename="../qt-ui/preferences.ui" line="914"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="849"/>
+        <location filename="../qt-ui/preferences.ui" line="920"/>
         <source>Proxy type</source>
         <translation>Tipo de proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="862"/>
+        <location filename="../qt-ui/preferences.ui" line="933"/>
         <source>Host</source>
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="888"/>
+        <location filename="../qt-ui/preferences.ui" line="959"/>
         <source>Port</source>
         <translation>Puerto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="914"/>
+        <location filename="../qt-ui/preferences.ui" line="985"/>
         <source>Requires authentication</source>
         <translation>Requiere autenticación</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="934"/>
+        <location filename="../qt-ui/preferences.ui" line="1005"/>
         <source>Username</source>
         <translation>Nombre de usuario</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="957"/>
+        <location filename="../qt-ui/preferences.ui" line="1028"/>
         <source>Password</source>
         <translation>Contraseña</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="985"/>
-        <source>about:blank</source>
-        <translation>about:blank</translation>
+        <location filename="../qt-ui/preferences.ui" line="1079"/>
+        <source>Disconnect from Facebook</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1011"/>
-        <source>Disconnect from facebook</source>
-        <translation>Desconectar de Facebook</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="824"/>
+        <location filename="../qt-ui/preferences.ui" line="895"/>
         <source>Filter</source>
         <translation>Filtros</translation>
     </message>
@@ -3927,52 +4170,52 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
         <translation>GF alto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="28"/>
+        <location filename="../qt-ui/preferences.cpp" line="44"/>
         <source>No proxy</source>
         <translation>Sin proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="29"/>
+        <location filename="../qt-ui/preferences.cpp" line="45"/>
         <source>System proxy</source>
         <translation>Proxy del sistema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="30"/>
+        <location filename="../qt-ui/preferences.cpp" line="46"/>
         <source>HTTP proxy</source>
         <translation>Proxy HTTP</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="31"/>
+        <location filename="../qt-ui/preferences.cpp" line="47"/>
         <source>SOCKS proxy</source>
         <translation>Proxy SOCKS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="291"/>
+        <location filename="../qt-ui/preferences.cpp" line="324"/>
         <source>Restart required</source>
         <translation>Reinicio requerido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="292"/>
+        <location filename="../qt-ui/preferences.cpp" line="325"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>Para cargar correctamente un nuevo lenguaje debes reiniciar Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="456"/>
+        <location filename="../qt-ui/preferences.cpp" line="494"/>
         <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
         <translation>Si pulsas ACEPTAR, todos los ajustes de Subsurface se reiniciarán a sus valores por defecto. Esto se aplicará inmediatamente.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Archivos XML de Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Open default log file</source>
         <translation>Abrir archivo de registro por defecto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="455"/>
+        <location filename="../qt-ui/preferences.cpp" line="493"/>
         <source>Warning</source>
         <translation>Advertencia</translation>
     </message>
@@ -3980,17 +4223,17 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="91"/>
+        <location filename="../qt-ui/printdialog.cpp" line="85"/>
         <source>&amp;Preview</source>
         <translation>&amp;Previsualizar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="88"/>
+        <location filename="../qt-ui/printdialog.cpp" line="82"/>
         <source>P&amp;rint</source>
         <translation>Imp&amp;rimir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="103"/>
+        <location filename="../qt-ui/printdialog.cpp" line="97"/>
         <source>Print</source>
         <translation>Imprimir</translation>
     </message>
@@ -3998,42 +4241,42 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="20"/>
         <source>Dive#</source>
         <translation>Inmersión n.º</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="21"/>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="22"/>
         <source>Depth</source>
         <translation>Profundidad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="23"/>
         <source>Duration</source>
         <translation>Duración</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Master</source>
         <translation>Guía</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Buddy</source>
         <translation>Compañero</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="34"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Location</source>
         <translation>Ubicación</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <location filename="../qt-ui/printlayout.cpp" line="63"/>
         <source>Subsurface cannot find a usable printer on this system!</source>
         <translation>¡Subsurface no puede encontrar una impresora utilizable e este sistema!</translation>
     </message>
@@ -4099,72 +4342,72 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2095"/>
+        <location filename="../qt-ui/models.cpp" line="2101"/>
         <source>unknown</source>
         <translation>desconocido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2100"/>
+        <location filename="../qt-ui/models.cpp" line="2106"/>
         <source>Dive #%1 - %2</source>
         <translation>Inmersión n.º %1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2103"/>
+        <location filename="../qt-ui/models.cpp" line="2109"/>
         <source>Max depth: %1 %2</source>
         <translation>Profundidad máxima: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2110"/>
+        <location filename="../qt-ui/models.cpp" line="2116"/>
         <source>Duration: %1 min</source>
         <translation>Duración: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2115"/>
+        <location filename="../qt-ui/models.cpp" line="2121"/>
         <source>Gas used:</source>
         <translation>Gas usado:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2117"/>
+        <location filename="../qt-ui/models.cpp" line="2123"/>
         <source>Tags:</source>
         <translation>Etiquetas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2119"/>
+        <location filename="../qt-ui/models.cpp" line="2125"/>
         <source>SAC:</source>
         <translation>CAS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2121"/>
+        <location filename="../qt-ui/models.cpp" line="2127"/>
         <source>Weights:</source>
         <translation>Lastre:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2126"/>
+        <location filename="../qt-ui/models.cpp" line="2132"/>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2133"/>
+        <location filename="../qt-ui/models.cpp" line="2139"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2135"/>
+        <location filename="../qt-ui/models.cpp" line="2141"/>
         <source>Buddy:</source>
         <translation>Compañero:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2137"/>
+        <location filename="../qt-ui/models.cpp" line="2143"/>
         <source>Suit:</source>
         <translation>Traje:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2139"/>
+        <location filename="../qt-ui/models.cpp" line="2145"/>
         <source>Viz:</source>
         <translation>Visibilidad:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2141"/>
+        <location filename="../qt-ui/models.cpp" line="2147"/>
         <source>Rating:</source>
         <translation>Calificación:</translation>
     </message>
@@ -4172,103 +4415,108 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="628"/>
         <source> (#%1 of %2)</source>
         <translation> (#%1 of %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="630"/>
+        <source>Unknown dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="647"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>Mostrar LND/TTS se ha desactivado por excesivo tiempo de proceso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1168"/>
         <source>Make first divecomputer</source>
         <translation>Hacer que sea el ordenador de buceo pricipal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Delete this divecomputer</source>
         <translation>Borrar este ordenador de buceo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1184"/>
         <source>Add gas change</source>
         <translation>Añadir cambio de gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1187"/>
         <source> (Tank %1)</source>
         <translation>(Botella %1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1195"/>
         <source>Add set-point change</source>
         <translation>Añadir cambio de &quot;set-point&quot;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1197"/>
         <source>Add bookmark</source>
         <translation>Añadir marca</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
         <source>Remove event</source>
         <translation>Borrar evento</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1206"/>
         <source>Hide similar events</source>
         <translation>Ocultar eventos similares</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1213"/>
         <source>Edit name</source>
         <translation>Editar nombre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1242"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1249"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>Ajustar presión de botella %1 (actualmente calculada como %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1264"/>
         <source>Unhide all events</source>
         <translation>Revelar todos los eventos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide events</source>
         <translation>Ocultar eventos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide all %1 events?</source>
         <translation>¿ Ocultar todos los eventos %1 ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1333"/>
         <source>Remove the selected event?</source>
         <translation>¿ Borrar el evento seleccionado ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1334"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1424"/>
         <source>Edit name of bookmark</source>
         <translation>Editar el nombre de la marca</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
         <source>Custom name:</source>
         <translation>Nombre personalizado:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1430"/>
         <source>Name is too long!</source>
         <translation>¡El nombre es demasiado largo!</translation>
     </message>
@@ -4276,102 +4524,102 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>AIR</source>
         <translation>AIRE</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>OXYGEN</source>
         <translation>OXÍGENO</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="208"/>
         <source>Remove this point</source>
         <translation>Borrar este punto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="57"/>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="42"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="25"/>
         <source>Average</source>
         <translation>Promedio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="45"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="28"/>
         <source>Minimum</source>
         <translation>Mínima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="48"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="31"/>
         <source>Maximum</source>
         <translation>Máxima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="297"/>
+        <location filename="../qt-ui/globe.cpp" line="296"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>Mueve el mapa y haz doble click para fijar la posición del buceo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="525"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="526"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="550"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="551"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="570"/>
+        <location filename="../qt-ui/models.cpp" line="574"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="571"/>
+        <location filename="../qt-ui/models.cpp" line="575"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="595"/>
+        <location filename="../qt-ui/models.cpp" line="599"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="596"/>
+        <location filename="../qt-ui/models.cpp" line="600"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="513"/>
         <source>Invalid response from server</source>
         <translation>Respuesta del servidor inválida</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation>Esperada etiqueta XML  &apos;DiveDateReader&apos;, se recibió &apos;%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="567"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation>No encontrada etiqueta XML esperada &apos;DiveDates&apos;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Respuesta XML mal formada. Línea %1:%2</translation>
     </message>
@@ -4379,12 +4627,12 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1450"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1518"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Esta función no esta disponible, todavía, para el ordenador seleccionado.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1442"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>No se pudo establecer conexión con el ordenador de buceo.</translation>
     </message>
@@ -4398,12 +4646,12 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
-        <location filename="../qt-ui/simplewidgets.cpp" line="151"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="134"/>
         <source>New starting number</source>
         <translation>Número de partida nuevo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="149"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="132"/>
         <source>New number</source>
         <translation>Nuevo número</translation>
     </message>
@@ -4411,12 +4659,12 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1575"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1653"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Esta función no está disponible, todavía, para el ordenador seleccionado.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1579"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1657"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>No se pudo establecer conexión con el ordenador de buceo.</translation>
     </message>
@@ -4495,12 +4743,12 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
         <translation>¿ Que fecha y hora se muestran en la imagen ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="276"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="259"/>
         <source>Open image file</source>
         <translation>Abrir archivo de imagen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="278"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="261"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Archivos de imagen (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -4553,10 +4801,9 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
     <name>SocialNetworkDialog</name>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="282"/>
-        <source>Dive Date: %1 
+        <source>Dive date: %1 
 </source>
-        <translation>Fecha de inmersión: %1 
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="285"/>
@@ -4579,10 +4826,9 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="290"/>
-        <source>Dive Location: %1 
+        <source>Dive location: %1 
 </source>
-        <translation>Lugar de la inmersión: %1 
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="293"/>
@@ -4700,47 +4946,47 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="329"/>
         <source>Webservice</source>
         <translation>Servicio web</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="393"/>
         <source>Connecting...</source>
         <translation>Conectando…</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
         <source>Download finished</source>
         <translation>Descarga finalizada</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Download error: %1</source>
         <translation>Error de descarga: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="436"/>
         <source>Connection error: </source>
         <translation>Error de conexión:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
         <source>Download successful</source>
         <translation>Descarga completa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="439"/>
         <source>Invalid user identifier!</source>
         <translation>El identificador de usuario no es válido.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="312"/>
         <source>Enter User ID and click Download</source>
         <translation>Introducir ID de usuario y pulsar Descargar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="442"/>
         <source>Cannot parse response!</source>
         <translation>No se puede analizar la respuesta.</translation>
     </message>
@@ -4748,7 +4994,7 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="592"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="575"/>
         <source>Suits: </source>
         <translation>Trajes:</translation>
     </message>
@@ -4756,7 +5002,7 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="119"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="116"/>
         <source>No suit set</source>
         <translation>Sin traje definido</translation>
     </message>
@@ -4773,7 +5019,7 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="513"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="496"/>
         <source>Tags: </source>
         <translation>Etiquetas:</translation>
     </message>
@@ -4781,7 +5027,7 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="144"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="141"/>
         <source>Empty tags</source>
         <translation>Etiquetas vacío</translation>
     </message>
@@ -4789,17 +5035,17 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -4807,7 +5053,7 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="141"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="131"/>
         <source>Information</source>
         <translation>Información</translation>
     </message>
@@ -4815,7 +5061,7 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1090"/>
+        <location filename="../qt-ui/models.cpp" line="1094"/>
         <source> (%1 shown)</source>
         <translation>(%1 mostrada)</translation>
     </message>
@@ -4823,72 +5069,72 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="64"/>
         <source>Check for updates.</source>
         <translation>Buscar actualizaciones</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="66"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface no pudo buscar actualizaciones.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="70"/>
         <source>The following error occurred:</source>
         <translation>Ocurrió el siguiente error:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="72"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
         <source>Please check your internet connection.</source>
         <translation>Por favor, comprueba la conexión a internet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="85"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="84"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>Está usando la última versión de Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="88"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>Está disponible una nueva versión de Subsurface.&lt;br/&gt;Pulse en:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; para descargarla.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="95"/>
         <source>A new version of Subsurface is available.</source>
         <translation>Está disponible una nueva versión de Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="97"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
         <source>Latest version is %1, please check with your OS vendor for updates.</source>
         <translation>La última versión es %1, por favor, comprueba actualizaciones con el proveedor de tu SO.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="103"/>
         <source>Newest release version is </source>
         <translation>La versión más reciente es</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="105"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
         <source>The server returned the following information:</source>
         <translation>El servidor devolvió la siguiente información:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="121"/>
         <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation>Subsurface comprueba cada dos semanas si está disponible una nueva versión. Si no deseas que Subsurface continúe efectuando la comprobación, pulsa &quot;Declinar&quot;, por favor.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
         <source>Decline</source>
         <translation>Declinar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="124"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
         <source>Accept</source>
         <translation>Aceptar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="126"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="125"/>
         <source>Automatic check for updates</source>
         <translation>Comprobación automática de actualizaciones</translation>
     </message>
@@ -4896,13 +5142,13 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
 <context>
     <name>UserManual</name>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="55"/>
+        <location filename="../qt-ui/usermanual.cpp" line="54"/>
         <source>User Manual</source>
         <translation>Manual de usuario</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="72"/>
-        <location filename="../qt-ui/usermanual.cpp" line="78"/>
+        <location filename="../qt-ui/usermanual.cpp" line="71"/>
+        <location filename="../qt-ui/usermanual.cpp" line="77"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>No puedo encontrar el manual de Subsurface</translation>
     </message>
@@ -4980,85 +5226,85 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
         <translation>¿De donde importas los datos?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
         <source>
 Operating System: %1</source>
         <translation>
 Sistema Operativo: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 Arquitectura de la CPU: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 Language: %1</source>
         <translation>
 Idioma: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="93"/>
         <source>Should we ask you later?</source>
         <translation>¿ Te preguntamos más adelante ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Don&apos;t ask me again</source>
         <translation>No me preguntes de nuevo </translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Ask later</source>
         <translation>Pregúntame más adelante</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
         <source>Submit user survey.</source>
         <translation>Enviar encuesta de Usuario.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask again?</source>
         <translation>¿ Preguntar de nuevo ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="17"/>
         <source>Send</source>
         <translation>Enviar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>
 Arquitectura del SO CPU : %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation>Subsurface no pudo enviar la encuesta a usuarios.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="121"/>
         <source>The following error occurred:</source>
         <translation>Ocurrió el siguiente error:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>Please check your internet connection.</source>
         <translation>Por favor, comprueba la conexión a internet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="131"/>
         <source>Survey successfully submitted.</source>
         <translation>Encuesta enviada correctamente.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="136"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation>Hubo un error al intentar buscar actualizaciones. &lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -5066,12 +5312,12 @@ Arquitectura del SO CPU : %1</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -5119,12 +5365,12 @@ Arquitectura del SO CPU : %1</translation>
         <translation>Subir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="247"/>
         <source>Operation timed out</source>
         <translation>Tiempo de espera sobrepasado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="268"/>
         <source>Transferring data...</source>
         <translation>Transfiriendo datos ...</translation>
     </message>
@@ -5132,17 +5378,17 @@ Arquitectura del SO CPU : %1</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="496"/>
+        <location filename="../qt-ui/models.cpp" line="500"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Hacer clic aquí borrará este sistema de lastre</translation>
     </message>
@@ -5150,19 +5396,19 @@ Arquitectura del SO CPU : %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1479"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1487"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1497"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1555"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1566"/>
         <source>Failed!</source>
         <translation>¡Fallo!</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1506"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1576"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Esta función no está disponible, todavía, para el ordenador seleccionado.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1580"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>No se pudo establecer conexión con el ordenador de buceo.</translation>
     </message>
@@ -5170,79 +5416,79 @@ Arquitectura del SO CPU : %1</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1841"/>
+        <location filename="../qt-ui/models.cpp" line="1847"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Año
 &gt; Mes / Viaje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1844"/>
+        <location filename="../qt-ui/models.cpp" line="1850"/>
         <source>#</source>
         <translation>N.º</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1847"/>
+        <location filename="../qt-ui/models.cpp" line="1853"/>
         <source>Duration 
  Total</source>
         <translation>Duración
 Total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1850"/>
+        <location filename="../qt-ui/models.cpp" line="1856"/>
         <source>
 Average</source>
         <translation>
 Media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1853"/>
+        <location filename="../qt-ui/models.cpp" line="1859"/>
         <source>
 Shortest</source>
         <translation>
 Más corta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1856"/>
+        <location filename="../qt-ui/models.cpp" line="1862"/>
         <source>
 Longest</source>
         <translation>
 Más larga</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1859"/>
+        <location filename="../qt-ui/models.cpp" line="1865"/>
         <source>Depth (%1)
  Average</source>
         <translation>Profundidad (%1)
 Media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1862"/>
-        <location filename="../qt-ui/models.cpp" line="1871"/>
-        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>
 Minimum</source>
         <translation>
 Mínimo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1865"/>
-        <location filename="../qt-ui/models.cpp" line="1874"/>
-        <location filename="../qt-ui/models.cpp" line="1883"/>
+        <location filename="../qt-ui/models.cpp" line="1871"/>
+        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>
 Maximum</source>
         <translation>
 Máximo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1874"/>
         <source>SAC (%1)
  Average</source>
         <translation>CAS (%1)
 Medio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1883"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -5323,40 +5569,40 @@ Media</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1508"/>
+        <location filename="../dive.c" line="1530"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) o (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="464"/>
+        <location filename="../divelist.c" line="467"/>
         <location filename="../equipment.c" line="81"/>
-        <location filename="../planner.c" line="1060"/>
-        <location filename="../planner.c" line="1063"/>
+        <location filename="../planner.c" line="1081"/>
+        <location filename="../planner.c" line="1084"/>
         <source>air</source>
         <translation>aire</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="192"/>
+        <location filename="../equipment.c" line="194"/>
         <source>integrated</source>
         <translation>integrado</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="193"/>
+        <location filename="../equipment.c" line="195"/>
         <source>belt</source>
         <translation>cinturón</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="194"/>
+        <location filename="../equipment.c" line="196"/>
         <source>ankle</source>
         <translation>tobillo</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="195"/>
+        <location filename="../equipment.c" line="197"/>
         <source>backplate weight</source>
         <translation>lastre en el arnes</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="196"/>
+        <location filename="../equipment.c" line="198"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -5364,7 +5610,7 @@ Media</translation>
         <location filename="../file.c" line="112"/>
         <location filename="../file.c" line="434"/>
         <location filename="../file.c" line="506"/>
-        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="925"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>No se pudo leer «%s»</translation>
     </message>
@@ -5421,9 +5667,9 @@ Media</translation>
         <translation>No se ha encontrado concordancia con ningún DC para el archivo &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../file.c" line="869"/>
-        <location filename="../file.c" line="909"/>
-        <location filename="../file.c" line="1007"/>
+        <location filename="../file.c" line="870"/>
+        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="1016"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>El máximo número de columnas que soporta importar CSV es %d</translation>
     </message>
@@ -5594,27 +5840,27 @@ Media</translation>
         <translation>el número de evento no es válido</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="421"/>
+        <location filename="../libdivecomputer.c" line="419"/>
         <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="427"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Error registering the data</source>
         <translation>Error al registrar los datos</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="433"/>
         <source>Error parsing the datetime</source>
         <translation>Error al analizar la fecha</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Dive %d: %s</source>
         <translation>Inmersión n.º %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="455"/>
+        <location filename="../libdivecomputer.c" line="454"/>
         <source>Error parsing the divetime</source>
         <translation>Error al analizar el tiempo de buceo</translation>
     </message>
@@ -5624,166 +5870,166 @@ Media</translation>
         <translation>Error al analizar la máxima profundidad</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="482"/>
+        <location filename="../libdivecomputer.c" line="483"/>
         <source>Error parsing temperature</source>
         <translation>Error al leer la temperatura</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="501"/>
+        <location filename="../libdivecomputer.c" line="503"/>
         <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="513"/>
+        <location filename="../libdivecomputer.c" line="515"/>
         <source>Error obtaining water salinity</source>
         <translation>Error al obtener salinidad del agua</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="521"/>
+        <location filename="../libdivecomputer.c" line="524"/>
         <source>Error obtaining surface pressure</source>
         <translation>Error al obtener la presión en superficie</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="545"/>
+        <location filename="../libdivecomputer.c" line="549"/>
         <source>Error obtaining divemode</source>
         <translation>Error al obtener el modo de buceo</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="562"/>
+        <location filename="../libdivecomputer.c" line="569"/>
         <source>Error parsing the gas mix</source>
         <translation>Error al analizar la mezcla de gas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="569"/>
+        <location filename="../libdivecomputer.c" line="576"/>
         <source>Error parsing the samples</source>
         <translation>Error al analizar las muestras</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="706"/>
+        <location filename="../libdivecomputer.c" line="713"/>
         <source>Event: waiting for user action</source>
         <translation>Evento: esperando acción del usuario</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="714"/>
+        <location filename="../libdivecomputer.c" line="721"/>
         <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="778"/>
+        <location filename="../libdivecomputer.c" line="785"/>
         <source>Error registering the event handler.</source>
         <translation>Error al registrar el manejador de eventos</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="783"/>
+        <location filename="../libdivecomputer.c" line="790"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Error al registrar el manejador de cancelación</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="804"/>
+        <location filename="../libdivecomputer.c" line="811"/>
         <source>Dive data import error</source>
         <translation>Error al importar datos de inmersiones</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="843"/>
+        <location filename="../libdivecomputer.c" line="850"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>No es posible crear el contexto de libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="850"/>
+        <location filename="../libdivecomputer.c" line="857"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>No se pudo abrir  %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="858"/>
+        <location filename="../libdivecomputer.c" line="865"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Privilegios insuficientes para abrir el dispositivo %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="506"/>
+        <location filename="../parse-xml.c" line="516"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Porcentaje extraño al leer %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1760"/>
+        <location filename="../parse-xml.c" line="1770"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>No se pudo analizar «%s»</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1989"/>
-        <location filename="../parse-xml.c" line="2137"/>
+        <location filename="../parse-xml.c" line="1999"/>
+        <location filename="../parse-xml.c" line="2147"/>
         <source>Database query dm4_events failed.
 </source>
         <translation>Ha fallado la consulta de la base de datos dm4_events.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1996"/>
-        <location filename="../parse-xml.c" line="2144"/>
+        <location filename="../parse-xml.c" line="2006"/>
+        <location filename="../parse-xml.c" line="2154"/>
         <source>Database query dm4_tags failed.
 </source>
         <translation>Ha fallado la consulta de la base de datos dm4_tags.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2318"/>
+        <location filename="../parse-xml.c" line="2328"/>
         <source>Database query shearwater_cylinders failed.
 </source>
         <translation>Ha fallado la consulta de la base de datos shearwater_cylinders.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2325"/>
+        <location filename="../parse-xml.c" line="2335"/>
         <source>Database query shearwater_changes failed.
 </source>
         <translation>Ha fallado la consulta de la base de datos shearwater_changes.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2332"/>
+        <location filename="../parse-xml.c" line="2342"/>
         <source>Database query shearwater_profile_sample failed.
 </source>
         <translation>Ha fallado la consulta de la base de datos shearwater_profile_sample.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2451"/>
+        <location filename="../parse-xml.c" line="2461"/>
         <source>Database query cobalt_cylinders failed.
 </source>
         <translation>Ha fallado la consulta de la base de datos cobalt_cylinders.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2458"/>
+        <location filename="../parse-xml.c" line="2468"/>
         <source>Database query cobalt_buddies failed.
 </source>
         <translation>Ha fallado la consulta de la base de datos cobalt_buddies.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2465"/>
+        <location filename="../parse-xml.c" line="2475"/>
         <source>Database query cobalt_visibility failed.
 </source>
         <translation>Ha fallado la consulta de la base de datos cobalt_visibility.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2472"/>
+        <location filename="../parse-xml.c" line="2482"/>
         <source>Database query cobalt_location failed.
 </source>
         <translation>Ha fallado la consulta de la base de datos cobalt_location.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2479"/>
+        <location filename="../parse-xml.c" line="2489"/>
         <source>Database query cobalt_location (site) failed.
 </source>
         <translation>Ha fallado la consulta de la base de datos cobalt_location (lugar).
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2486"/>
+        <location filename="../parse-xml.c" line="2496"/>
         <source>Database query cobalt_profile_sample failed.
 </source>
         <translation>Ha fallado la consulta de la base de datos cobalt_profile_sample.
@@ -5797,17 +6043,17 @@ Media</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2168"/>
-        <location filename="../parse-xml.c" line="2189"/>
-        <location filename="../parse-xml.c" line="2508"/>
-        <location filename="../parse-xml.c" line="2527"/>
+        <location filename="../parse-xml.c" line="2178"/>
+        <location filename="../parse-xml.c" line="2199"/>
+        <location filename="../parse-xml.c" line="2518"/>
+        <location filename="../parse-xml.c" line="2537"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Falló la petición a la base de datos «%s».
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2848"/>
+        <location filename="../parse-xml.c" line="2909"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>No se puede abrir la hoja de estilo %s</translation>
     </message>
@@ -5817,161 +6063,167 @@ Media</translation>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="820"/>
+        <location filename="../planner.c" line="841"/>
         <source>Can&apos;t find gas %s</source>
         <translation>No puedo encontrar el gas %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="356"/>
+        <location filename="../planner.c" line="363"/>
         <source>Too many gas mixes</source>
         <translation>Demasiadas mezclas de gas</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="540"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation>Cálculo de descompresión abortado por exceso de tiempo</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="548"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation>basado en GFbajo = %d y GFalto = %d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="544"/>
+        <location filename="../planner.c" line="551"/>
         <source>Subsurface dive plan</source>
         <translation>Plan de buceo de Subsurface</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="548"/>
+        <location filename="../planner.c" line="555"/>
         <source>depth</source>
         <translation>Profundidad</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="558"/>
         <source>runtime</source>
         <translation>Tiempo acumulado</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="554"/>
+        <location filename="../planner.c" line="561"/>
         <source>duration</source>
         <translation>Duración</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="557"/>
+        <location filename="../planner.c" line="564"/>
         <source>gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="594"/>
+        <location filename="../planner.c" line="601"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Transición a %.*f %s en %d:%02d min - tiempo acumulado %d:%02u con %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="602"/>
+        <location filename="../planner.c" line="609"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Cambio de cota a %.*f %s en %d:%02d min - tiempo acumulado %d:%02u con %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="615"/>
+        <location filename="../planner.c" line="622"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Permanecer a  %.*f %s durante %d:%02d min - tiempo acumulado %d:%02u con %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="622"/>
+        <location filename="../planner.c" line="629"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Permanecer a %.*f %s durante %d:%02d min - tiempo acumulado %d:%02u con %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="635"/>
+        <location filename="../planner.c" line="642"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="638"/>
-        <location filename="../planner.c" line="642"/>
+        <location filename="../planner.c" line="645"/>
+        <location filename="../planner.c" line="649"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="651"/>
+        <location filename="../planner.c" line="658"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="676"/>
+        <location filename="../planner.c" line="683"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Cambiar gas a %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="678"/>
+        <location filename="../planner.c" line="685"/>
         <source>Switch gas to %s</source>
         <translation>Cambiar gas a %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="697"/>
+        <location filename="../planner.c" line="704"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="699"/>
+        <location filename="../planner.c" line="706"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="710"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Consumo de gas (excluidos segmentos con CCR)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="705"/>
+        <location filename="../planner.c" line="712"/>
         <source>Gas consumption:</source>
         <translation>Consumo de gas:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="535"/>
-        <location filename="../planner.c" line="725"/>
-        <location filename="../planner.c" line="730"/>
-        <location filename="../planner.c" line="753"/>
+        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="732"/>
+        <location filename="../planner.c" line="737"/>
+        <location filename="../planner.c" line="762"/>
+        <location filename="../planner.c" line="772"/>
         <source>Warning:</source>
         <translation>Aviso:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="523"/>
+        <location filename="../planner.c" line="530"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
         <translation>DESCARGO DE RESPONSABILIDAD / AVISO:  ESTA ES UNA NUEVA IMPLEMENTACIÓN DEL ALGORITMO BUHLMANN Y UNA IMPLEMENTACIÓN DE UN PLANIFICADOR DE INMERSIÓN BASADO EN ÉL QUE SOLO HA SIDO PROBADA DE FORMA LIMITADA.   RECOMENDAMOS FIRMEMENTE NO PLANIFICAR INMERSIONES BASADAS SIMPLEMENTE EN LOS RESULTADOS QUE SE OBTENGAN AQUÍ.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="726"/>
+        <location filename="../planner.c" line="733"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>!Esto es más gas del disponible en la botella especificada¡</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="731"/>
+        <location filename="../planner.c" line="738"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>¡Reserva insuficiente para compartir gas durante el ascenso!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="733"/>
+        <location filename="../planner.c" line="740"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s de %s (%.0f%s/%.0f%s en el ascenso planeado)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="735"/>
+        <location filename="../planner.c" line="742"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s durante el ascenso planeado) of %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="759"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>Valor de pO₂ alto %.2f a %d:%02u con %s a la profundidad de %.*f %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="1064"/>
+        <location filename="../planner.c" line="769"/>
+        <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="1085"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1099"/>
+        <location filename="../profile.c" line="1113"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -5980,70 +6232,70 @@ Prof: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1102"/>
+        <location filename="../profile.c" line="1116"/>
         <source>P: %d%s
 </source>
         <translation>Pres: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1106"/>
+        <location filename="../profile.c" line="1120"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1112"/>
+        <location filename="../profile.c" line="1126"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1115"/>
+        <location filename="../profile.c" line="1129"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>CAS: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1117"/>
+        <location filename="../profile.c" line="1131"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1119"/>
+        <location filename="../profile.c" line="1133"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1121"/>
+        <location filename="../profile.c" line="1135"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1123"/>
+        <location filename="../profile.c" line="1137"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1140"/>
         <source>MOD: %d%s
 </source>
         <translation>PMO: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1147"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -6052,7 +6304,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1137"/>
+        <location filename="../profile.c" line="1151"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -6061,149 +6313,149 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1149"/>
+        <location filename="../profile.c" line="1163"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Parada de seguridad: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1152"/>
+        <location filename="../profile.c" line="1166"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Parada de seguridad: tiempo desc @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1157"/>
+        <location filename="../profile.c" line="1171"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Parada deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1174"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Parada deco: tiempo desc @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1178"/>
         <source>In deco
 </source>
         <translation>En deco
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1166"/>
+        <location filename="../profile.c" line="1180"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1183"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1172"/>
+        <location filename="../profile.c" line="1186"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Parada deco: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1180"/>
+        <location filename="../profile.c" line="1194"/>
         <source>In deco (calc)
 </source>
         <translation>En deco (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1196"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1185"/>
+        <location filename="../profile.c" line="1199"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1188"/>
+        <location filename="../profile.c" line="1202"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Techo calculado %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1194"/>
+        <location filename="../profile.c" line="1208"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Tejido %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1214"/>
         <source>heartbeat: %d
 </source>
         <translation>Ritmo cardiaco: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1202"/>
+        <location filename="../profile.c" line="1216"/>
         <source>bearing: %d
 </source>
         <translation>Soporte: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1205"/>
+        <location filename="../profile.c" line="1219"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>Prof. media hasta aquí %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1314"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1304"/>
-        <location filename="../profile.c" line="1308"/>
-        <location filename="../profile.c" line="1312"/>
+        <location filename="../profile.c" line="1318"/>
+        <location filename="../profile.c" line="1322"/>
+        <location filename="../profile.c" line="1326"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sProf:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1316"/>
+        <location filename="../profile.c" line="1330"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sProf:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1334"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1324"/>
-        <location filename="../profile.c" line="1328"/>
+        <location filename="../profile.c" line="1338"/>
+        <location filename="../profile.c" line="1342"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1335"/>
+        <location filename="../profile.c" line="1349"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sPres:%d %s</translation>
     </message>
@@ -6334,6 +6586,7 @@ EADD: %d%s
     </message>
     <message>
         <location filename="../dive.c" line="30"/>
+        <location filename="../equipment.c" line="85"/>
         <source>oxygen</source>
         <translation>oxígeno</translation>
     </message>
@@ -6388,97 +6641,97 @@ EADD: %d%s
         <translation>(ninguna inmersión)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sun</source>
         <translation>Do</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Mon</source>
         <translation>Lu</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Tue</source>
         <translation>Ma</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Wed</source>
         <translation>Mi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Thu</source>
         <translation>Ju</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Fri</source>
         <translation>Vi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sat</source>
         <translation>Sa</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jan</source>
         <translation>Ene</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Apr</source>
         <translation>Abr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>May</source>
         <translation>Mayo</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Aug</source>
         <translation>Ago</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Oct</source>
         <translation>Oct</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Dec</source>
         <translation>Dic</translation>
     </message>
@@ -7082,13 +7335,13 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Planificar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
         <source>GF low</source>
         <translation>GF bajo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>%</source>
         <translation>%</translation>
     </message>
@@ -7098,7 +7351,7 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>GF alto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="335"/>
         <source>Drop to first depth</source>
         <translation>Caer a la primera profundidad</translation>
     </message>
@@ -7108,69 +7361,69 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Última parada a 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
         <source>Plan backgas breaks</source>
         <translation>Planear &quot;breaks&quot; con gas de fondo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="355"/>
         <source>Gas options</source>
         <translation>Opciones de gases</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="376"/>
         <source>Bottom SAC</source>
         <translation>CAS en fondo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="383"/>
         <source>Deco SAC</source>
         <translation>CAS en deco</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="380"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="390"/>
         <source>Bottom pO₂</source>
         <translation>pO₂ en el fondo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="403"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="413"/>
         <source>Deco pO₂</source>
         <translation>pO₂ en deco</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="449"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="462"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="478"/>
         <source>Dive notes</source>
         <translation>Notas de la inmersión</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
         <source>Display runtime</source>
         <translation>Mostrar tiempo acumulado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <source>Display segment duration</source>
         <translation>Mostrar duración de los segmentos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="531"/>
         <source>Display transitions in deco</source>
         <translation>Mostrar transiciones en deco</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="538"/>
         <source>Verbatim dive plan</source>
         <translation>Plan de buceo detallado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="387"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="410"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="397"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -7190,17 +7443,17 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>De 6m a superficie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="499"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>En planificación, mostrar tiempo acumulado de paradas (tiempo absoluto)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="515"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>En planificación, mostrar duración de paradas (tiempo relativo)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>En planificación, listar transiciones o considerarlas implicitas</translation>
     </message>
diff --git a/translations/subsurface_et_EE.ts b/translations/subsurface_et_EE.ts
index d5867d352..1268e88df 100644
--- a/translations/subsurface_et_EE.ts
+++ b/translations/subsurface_et_EE.ts
@@ -3,12 +3,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="539"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="522"/>
         <source>Person: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="540"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="523"/>
         <source>Searches for buddies and divemasters</source>
         <translation type="unfinished"/>
     </message>
@@ -16,40 +16,188 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="233"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="230"/>
         <source>No buddies</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>ColumnNameProvider</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>GPS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Avg depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="210"/>
+        <location filename="../configuredivecomputer.cpp" line="212"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="226"/>
+        <location filename="../configuredivecomputer.cpp" line="228"/>
         <source>Could not open backup file: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="542"/>
+        <location filename="../configuredivecomputer.cpp" line="552"/>
         <source>Dive computer details read successfully</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="551"/>
+        <location filename="../configuredivecomputer.cpp" line="561"/>
         <source>Setting successfully written to device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="560"/>
+        <location filename="../configuredivecomputer.cpp" line="570"/>
         <source>Device firmware successfully updated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="569"/>
+        <location filename="../configuredivecomputer.cpp" line="579"/>
         <source>Device settings successfully reset</source>
         <translation type="unfinished"/>
     </message>
@@ -847,70 +995,70 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1053"/>
         <source>Backup files (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1037"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1040"/>
         <source>Backup succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1041"/>
         <source>Your settings have been saved to: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1030"/>
         <source>Backup dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1036"/>
         <source>XML backup error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1052"/>
         <source>Restore dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1056"/>
         <source>XML restore error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1057"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1063"/>
         <source>Restore succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1064"/>
         <source>Your settings have been restored successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1074"/>
         <source>Select firmware file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1075"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -968,12 +1116,12 @@
         <translation>Siin klikkamine eemaldab selle ballooni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="410"/>
         <source>Cylinder cannot be removed</source>
         <translation>Ballooni ei saa eemaldada</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="407"/>
+        <location filename="../qt-ui/models.cpp" line="411"/>
         <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>
@@ -1049,12 +1197,12 @@
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="48"/>
         <source>Remove the selected dive computer?</source>
         <translation>Eemalda valitud sukeldumiskompuuter?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="49"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
         <translation>Oled kindel et soovid eemaldada
@@ -1069,22 +1217,22 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Model</source>
         <translation>Mudel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Device ID</source>
         <translation>Seadme ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Nickname</source>
         <translation>Hüüdnimi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Siin klikates eemaldate selle sukeldumiskompuutri.</translation>
     </message>
@@ -1092,117 +1240,145 @@
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="115"/>
         <source>Bailing out to OC</source>
         <translation>Üleminek avatud süsteemile</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="117"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> algus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> lõpp</translation>
     </message>
 </context>
 <context>
+    <name>DiveImportedModel</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="556"/>
+        <source>Date/time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
+        <source>Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>h:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>min</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1242"/>
+        <location filename="../qt-ui/models.cpp" line="1248"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1245"/>
+        <location filename="../qt-ui/models.cpp" line="1251"/>
         <source>Date</source>
         <translation>Kuupäev</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1248"/>
+        <location filename="../qt-ui/models.cpp" line="1254"/>
         <source>Rating</source>
         <translation>Hinne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>ft</source>
         <translation>jalg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1254"/>
+        <location filename="../qt-ui/models.cpp" line="1260"/>
         <source>Duration</source>
         <translation>Kestus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1263"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>lbs</source>
         <translation>nael</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1263"/>
+        <location filename="../qt-ui/models.cpp" line="1269"/>
         <source>Suit</source>
         <translation>Ülikond</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1266"/>
+        <location filename="../qt-ui/models.cpp" line="1272"/>
         <source>Cyl</source>
         <translation>Ball</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1269"/>
+        <location filename="../qt-ui/models.cpp" line="1275"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1277"/>
+        <location filename="../qt-ui/models.cpp" line="1283"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1280"/>
+        <location filename="../qt-ui/models.cpp" line="1286"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1283"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>Location</source>
         <translation>Asukoht</translation>
     </message>
@@ -1210,87 +1386,87 @@
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="787"/>
+        <location filename="../qt-ui/divelistview.cpp" line="768"/>
         <source>Expand all</source>
         <translation>Laienda kõik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="788"/>
+        <location filename="../qt-ui/divelistview.cpp" line="769"/>
         <source>Collapse all</source>
         <translation>Ahenda kõik kokku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="789"/>
+        <location filename="../qt-ui/divelistview.cpp" line="770"/>
         <source>Collapse others</source>
         <translation>Ahenda teised</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="791"/>
+        <location filename="../qt-ui/divelistview.cpp" line="772"/>
         <source>Remove dive(s) from trip</source>
         <translation>Eemalda sukeldumine/sukeldumised väljasõidust</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="792"/>
+        <location filename="../qt-ui/divelistview.cpp" line="773"/>
         <source>Create new trip above</source>
         <translation>Loo uus väljasõit üles</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="806"/>
+        <location filename="../qt-ui/divelistview.cpp" line="787"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Lisa sukeldumine/sukeldumised otse eespool asuvale väljasõidule</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="808"/>
+        <location filename="../qt-ui/divelistview.cpp" line="789"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Lisa sukeldumine/sukeldumised otse allpool asuvale väljasõidule</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="812"/>
+        <location filename="../qt-ui/divelistview.cpp" line="793"/>
         <source>Merge trip with trip above</source>
         <translation>Ühenda väljasõit väljasõiduga ülal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="813"/>
+        <location filename="../qt-ui/divelistview.cpp" line="794"/>
         <source>Merge trip with trip below</source>
         <translation>Ühenda väljasõit väljasõiduga all</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="817"/>
+        <location filename="../qt-ui/divelistview.cpp" line="798"/>
         <source>Delete dive(s)</source>
         <translation>Kustuta sukeldumine/sukeldumised</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="819"/>
+        <location filename="../qt-ui/divelistview.cpp" line="800"/>
         <source>Mark dive(s) invalid</source>
         <translation>Märgi sukeldumine/sukeldumised kehtetuks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="823"/>
+        <location filename="../qt-ui/divelistview.cpp" line="804"/>
         <source>Merge selected dives</source>
         <translation>Ühenda valitud sukeldumised</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="825"/>
+        <location filename="../qt-ui/divelistview.cpp" line="806"/>
         <source>Renumber dive(s)</source>
         <translation>Nummerda sukeldumine/sukeldumised ümber</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="826"/>
+        <location filename="../qt-ui/divelistview.cpp" line="807"/>
         <source>Shift times</source>
         <translation>Nihuta ajad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="827"/>
+        <location filename="../qt-ui/divelistview.cpp" line="808"/>
         <source>Load images</source>
         <translation>Lae pildid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Open image files</source>
         <translation>Ava pildifailid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Pildifailid (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -1475,100 +1651,100 @@
         <translation>Liiv</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF failid (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="268"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>CSV failid (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="68"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Geneeriline formaat, mida kasutatakse andmevahetuseks erinevate sukeldumisega seotud tarkvarade vahel.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Saada sukeldumiste info divelogs.de kodulehele</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>Maailmakaardil visualiseeritavate sukeldumiskohtade eksport HTML-formaadis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurface oma XML vorming</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
         <source>Write depths of images to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export UDDF file as</source>
         <translation>Ekspordi UDDF fail kui</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="267"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
         <source>Export CSV file as</source>
         <translation>Ekspordi CSV fail kui</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="278"/>
         <source>Export world map</source>
         <translation>Ekspordi maailmakaart</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="299"/>
         <source>HTML files (*.html)</source>
         <translation>HTML failid (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="283"/>
         <source>Export Subsurface XML</source>
         <translation>Ekspordi Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="284"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML failid (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
         <source>Save image depths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="298"/>
         <source>Export HTML files as</source>
         <translation>Ekspordi HTML fail kui</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
         <source>Can&apos;t open file %s</source>
         <translation>Ei saa avada faili %s</translation>
     </message>
@@ -1581,248 +1757,228 @@
         <translation>Impordi sukeldumiste logi fail</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
-        <source>CSV options</source>
-        <translation>CSV valikud</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="281"/>
-        <source>Pre-configured imports</source>
-        <translation>Eelseadistatud impordid</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="122"/>
-        <source>Depth</source>
-        <translation>Sügavus</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="142"/>
-        <source>Stopdepth</source>
-        <translation>Peatuse sügavus</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="162"/>
-        <source>Pressure</source>
-        <translation>Rõhk</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="176"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="466"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
         <source>Time</source>
         <translation>Aeg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="183"/>
-        <source>Temp</source>
-        <translation>Temp</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="213"/>
-        <source>NDL</source>
-        <translation>NDL</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="233"/>
-        <source>TTS</source>
-        <translation>TTS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="253"/>
-        <source>Cns</source>
-        <translation>Cns</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="58"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="789"/>
-        <source>Field separator</source>
-        <translation>Välja eraldaja</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="35"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="363"/>
-        <source>Units</source>
-        <translation>Ühikud</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="42"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="370"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="97"/>
         <source>Metric</source>
         <translation>SI</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="47"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="375"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="102"/>
         <source>Imperial</source>
         <translation>Briti/Ameerika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="169"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="298"/>
-        <source>Manual dives</source>
-        <translation>Käsitsi sisestatud sukeldumised</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="316"/>
-        <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="319"/>
-        <source>Date format</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="332"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="59"/>
         <source>dd.mm.yyyy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="337"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="64"/>
         <source>mm/dd/yyyy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="342"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="69"/>
         <source>yyyy-mm-dd</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="392"/>
-        <source>Dive #</source>
-        <translation>Sukeldumise #</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="426"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="439"/>
-        <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+        <source>Dive #</source>
+        <translation>Sukeldumise #</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="429"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
         <source>Date</source>
         <translation>Kuupäev</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="500"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="513"/>
-        <source>Dive duration in seconds or in min:sec format</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="503"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
         <source>Duration</source>
         <translation>Kestus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="574"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
         <source>GPS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="591"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
         <source>Tags</source>
         <translation>Märgendid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="608"/>
-        <source>Cyl size</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+        <source>He</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="625"/>
-        <source>Air temp</source>
-        <translation>Õhu temp</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="78"/>
+        <source>Seconds</source>
+        <translation>Sekundid</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
+        <source>Minutes</source>
+        <translation>Minutid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="642"/>
-        <source>Start Pressure</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="88"/>
+        <source>Minutes:seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="659"/>
-        <source>Water temp</source>
-        <translation>Vee temp</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+        <source>Location</source>
+        <translation>Asukoht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="676"/>
-        <source>End Press</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+        <source>Max depth</source>
+        <translation>Max sügavus</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+        <source>Tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="693"/>
-        <source>O₂</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="710"/>
-        <source>He</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+        <source>Sample time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="742"/>
-        <source>Choose duration format.</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+        <source>Sample depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="745"/>
-        <source>Duration format</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+        <source>Sample temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="758"/>
-        <source>Seconds</source>
-        <translation>Sekundid</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="763"/>
-        <source>Minutes</source>
-        <translation>Minutid</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="768"/>
-        <source>Minutes:seconds</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+        <source>Sample ndl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="540"/>
-        <source>Location</source>
-        <translation>Asukoht</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="409"/>
-        <source>Max depth</source>
-        <translation>Max sügavus</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="386"/>
-        <source>Field configuration</source>
-        <translation>Välja vorming</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+        <source>Samples pressure</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
         <source>Mean depth</source>
         <translation>Keskmine sügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="483"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
         <source>Buddy</source>
         <translation>Semu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="523"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
         <source>Notes</source>
         <translation>Märkmed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="557"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
         <source>Weight</source>
         <translation>Raskus</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DivePlanner</name>
@@ -1865,42 +2021,42 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
         <source>unknown</source>
         <translation>tundmatu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="691"/>
         <source>Final depth</source>
         <translation>Lõppsügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="693"/>
         <source>Run time</source>
         <translation>Töö aeg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="701"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="695"/>
         <source>Duration</source>
         <translation>Kestus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="703"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
         <source>Used gas</source>
         <translation>Kasutatud gaas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="705"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
         <source>CC set point</source>
         <translation>CC seadepunkt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1044"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1051"/>
         <source>Discard the plan?</source>
         <translation>Loobu plaanist?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1045"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1052"/>
         <source>You are about to discard your plan.</source>
         <translation>Oled plaanist loobumas.</translation>
     </message>
@@ -1908,22 +2064,22 @@
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="257"/>
         <source>Dive planner points</source>
         <translation>Sukeldumise planeerija punktid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="261"/>
         <source>Available gases</source>
         <translation>Saadaval gaasid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="284"/>
         <source>Add dive data point</source>
         <translation>Lisa sukeldumise andmepunkt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="304"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="293"/>
         <source>Save new</source>
         <translation type="unfinished"/>
     </message>
@@ -1931,92 +2087,112 @@
 <context>
     <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Depth</source>
         <translation>Sügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
         <source>Time</source>
         <translation>Aeg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
         <source>Pressure</source>
         <translation>Rõhk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>Temperature</source>
         <translation>Temperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
         <source>Color</source>
         <translation>Värvus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
         <source>Pressure S</source>
         <translation>Rõhk S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
         <source>pHe</source>
         <translation>pHE</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
+        <source>Setpoint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
+        <source>Sensor1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
+        <source>Sensor2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
+        <source>Sensor3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
         <source>Ambient pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
-        <source>Heart Beat</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
+        <source>Heart beat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
-        <source>Gradient Factor</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/>
+        <source>Gradient factor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
-        <source>Mean Depth/s</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
+        <source>Mean depth/s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
         <source>Pressure I</source>
         <translation>Rõhk I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
         <source>User entered</source>
         <translation>Kasutaja sisestatud</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
         <source>Cylinder index</source>
         <translation>Ballooni indeks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
         <source>Ceiling</source>
         <translation>Lagi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
@@ -2067,127 +2243,127 @@
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1437"/>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1443"/>
+        <location filename="../qt-ui/models.cpp" line="1489"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1440"/>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1492"/>
         <source>Date</source>
         <translation>Kuupäev</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1443"/>
-        <location filename="../qt-ui/models.cpp" line="1489"/>
+        <location filename="../qt-ui/models.cpp" line="1449"/>
+        <location filename="../qt-ui/models.cpp" line="1495"/>
         <source>Rating</source>
         <translation>Hinne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1452"/>
         <source>Depth</source>
         <translation>Sügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1458"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1461"/>
         <source>Weight</source>
         <translation>Raskus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>ft</source>
         <translation>jalg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1458"/>
-        <location filename="../qt-ui/models.cpp" line="1504"/>
+        <location filename="../qt-ui/models.cpp" line="1464"/>
+        <location filename="../qt-ui/models.cpp" line="1510"/>
         <source>Suit</source>
         <translation>Ülikond</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1461"/>
-        <location filename="../qt-ui/models.cpp" line="1507"/>
+        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1513"/>
         <source>Cyl</source>
         <translation>Ball</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1464"/>
-        <location filename="../qt-ui/models.cpp" line="1510"/>
+        <location filename="../qt-ui/models.cpp" line="1470"/>
+        <location filename="../qt-ui/models.cpp" line="1516"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1473"/>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1527"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
-        <location filename="../qt-ui/models.cpp" line="1524"/>
+        <location filename="../qt-ui/models.cpp" line="1482"/>
+        <location filename="../qt-ui/models.cpp" line="1530"/>
         <source>Location</source>
         <translation>Asukoht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1449"/>
-        <location filename="../qt-ui/models.cpp" line="1495"/>
+        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1501"/>
         <source>Duration</source>
         <translation>Kestus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1498"/>
+        <location filename="../qt-ui/models.cpp" line="1504"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>lbs</source>
         <translation>nael</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1470"/>
-        <location filename="../qt-ui/models.cpp" line="1518"/>
+        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1524"/>
         <source>OTU</source>
         <translation>Hapnikumürgistuse ühik (OTU)</translation>
     </message>
@@ -2195,95 +2371,95 @@
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="98"/>
         <source>no dives were selected</source>
         <translation>Ühtegi sukeldumist pole valitud</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="117"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>zip-faili loomine üleslaadimiseks ebaõnnestus: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="143"/>
         <source>cannot create temporary file: %s</source>
         <translation>ei suuda luua ajutist faili: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/>
         <source>internal error: %s</source>
         <translation>sisemine viga: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="169"/>
         <source>internal error</source>
         <translation>sisemine viga</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="629"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="828"/>
         <source>Done</source>
         <translation>Valmis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/>
         <source>Uploading dive list...</source>
         <translation>Sukeldumiste listi üleslaadimine...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="692"/>
         <source>Downloading dive list...</source>
         <translation>Sukeldumiste listi allalaadimine...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="741"/>
         <source>Downloading %1 dives...</source>
         <translation>Laen alla %1 sukeldumist...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="785"/>
         <source>Download finished - %1</source>
         <translation>Allalaadimine lõppenud - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="802"/>
         <source>Corrupted download</source>
         <translation>Vigane allalaadimine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Arhiivi ei saa avada:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
         <source>Upload failed</source>
         <translation>Üleslaadimine ebaõnnestus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/>
         <source>Upload successful</source>
         <translation>Üleslaadimine edukas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
         <source>Login failed</source>
         <translation>Sisselogimine ebaõnnestus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
         <source>Cannot parse response</source>
         <translation>Ei suuda vastust tuvastada</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
         <source>Error: %1</source>
         <translation>Viga: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="829"/>
         <source>Upload finished</source>
         <translation>Üleslaadimine lõppenud</translation>
     </message>
@@ -2291,54 +2467,52 @@
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="169"/>
         <source>Error</source>
         <translation>Viga</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="400"/>
         <source>Retry</source>
         <translation>Korda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="264"/>
         <source>Find Uemis dive computer</source>
         <translation>Leia Uemis sukeldumiskompuuter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Vali sukeldumiskompuutri allalaadimise logifail</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Log files (*.log)</source>
         <translation>Logifailid (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="362"/>
         <source>Warning</source>
         <translation>Hoiatus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="363"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>libdivecomputer tõmmisefaili salvestamine EI LAE sukeldumised sukeldumiste listi.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="374"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Vali sukeldumiskompuutri binaarformaadis tõmmisefail</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="375"/>
         <source>Dump files (*.bin)</source>
         <translation>Tõmmisefailid (*.bin)</translation>
     </message>
@@ -2346,7 +2520,7 @@
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="101"/>
         <source>Vendor</source>
         <translation>Tootja</translation>
     </message>
@@ -2356,54 +2530,74 @@
         <translation>Allalaadimine sukeldumiskompuutrist</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="31"/>
         <source>Device or mount point</source>
         <translation>Seade või ühenduspunkt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="111"/>
         <source>Dive computer</source>
         <translation>Sukeldumiskompuuter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="132"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="45"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="80"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="94"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="52"/>
         <source>Force download of all dives</source>
         <translation>Kõikide sukeldumiste jõuga allalaadimine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
         <source>Always prefer downloaded dives</source>
         <translation>Eelista alati allalaetud sukeldumisi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="189"/>
         <source>Cancel</source>
         <translation>Loobu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/>
+        <source>Downloaded Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
+        <source>Select all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
+        <source>Unselect all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
         <source>Save libdivecomputer logfile</source>
         <translation>Salvesta libdivecomputer logifail</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="87"/>
         <source>Save libdivecomputer dumpfile</source>
         <translation>Salvesta libdivecomputer tõmmisefail</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
         <source>Download into new trip</source>
         <translation type="unfinished"/>
     </message>
@@ -2411,12 +2605,12 @@
 <context>
     <name>ExtraDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Value</source>
         <translation type="unfinished"/>
     </message>
@@ -2430,21 +2624,21 @@
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="245"/>
-        <source>Your dive profile was updated to facebook.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
-        <source>Photo Upload Failed</source>
+        <source>Your dive profile was updated to Facebook.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="250"/>
-        <source>Your dive profile was not updated to facebook, 
+        <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+        <source>Photo Upload Failed</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>FilterWidget</name>
@@ -2485,17 +2679,17 @@
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1544"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1621"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1624"/>
         <source>Firmware update failed!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1550"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1627"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -2503,7 +2697,7 @@
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="128"/>
+        <location filename="../qt-ui/globe.cpp" line="119"/>
         <source>Edit selected dive locations</source>
         <translation>Toimeta valitud sukeldumiskohti</translation>
     </message>
@@ -2511,7 +2705,7 @@
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="566"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="549"/>
         <source>Location: </source>
         <translation type="unfinished"/>
     </message>
@@ -2519,7 +2713,7 @@
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="286"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="283"/>
         <source>No location set</source>
         <translation type="unfinished"/>
     </message>
@@ -2527,330 +2721,335 @@
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="133"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
+        <location filename="../qt-ui/maintab.cpp" line="497"/>
         <source>Location</source>
         <translation>Asukoht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="67"/>
         <source>Coordinates</source>
         <translation>Koordinaadid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="169"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="154"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Buddy</source>
         <translation>Semu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="222"/>
+        <location filename="../qt-ui/maintab.ui" line="277"/>
         <source>Tags</source>
         <translation>Märgendid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="186"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
         <source>Rating</source>
         <translation>Hinne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="221"/>
         <source>Visibility</source>
         <translation>Nähtavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="230"/>
         <source>Suit</source>
         <translation>Ülikond</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="465"/>
+        <location filename="../qt-ui/maintab.cpp" line="470"/>
         <source>Dive notes</source>
         <translation>Sukeldumise märkmed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
-        <location filename="../qt-ui/maintab.ui" line="648"/>
-        <location filename="../qt-ui/maintab.cpp" line="277"/>
+        <location filename="../qt-ui/maintab.ui" line="74"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="102"/>
+        <location filename="../qt-ui/maintab.ui" line="677"/>
+        <location filename="../qt-ui/maintab.cpp" line="279"/>
         <source>Air temp.</source>
         <translation>Õhu temp.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <location filename="../qt-ui/maintab.ui" line="667"/>
-        <location filename="../qt-ui/maintab.cpp" line="278"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.ui" line="696"/>
+        <location filename="../qt-ui/maintab.cpp" line="280"/>
         <source>Water temp.</source>
         <translation>Vee temp.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="229"/>
-        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.ui" line="284"/>
+        <location filename="../qt-ui/maintab.cpp" line="498"/>
         <source>Notes</source>
         <translation>Märkmed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="369"/>
+        <location filename="../qt-ui/maintab.ui" line="398"/>
         <source>Equipment</source>
         <translation>Varustus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="496"/>
+        <location filename="../qt-ui/maintab.ui" line="525"/>
         <source>Gases used</source>
         <translation>Kasutatud gaasid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="515"/>
+        <location filename="../qt-ui/maintab.ui" line="544"/>
         <source>Gas consumed</source>
         <translation>Kulutatud gaasid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="553"/>
+        <location filename="../qt-ui/maintab.ui" line="582"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="591"/>
+        <location filename="../qt-ui/maintab.ui" line="620"/>
         <source>Max. depth</source>
         <translation>Max sügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="629"/>
+        <location filename="../qt-ui/maintab.ui" line="658"/>
         <source>Air pressure</source>
         <translation>Õhurõhk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="686"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>Dive time</source>
         <translation>Sukeldumise aeg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="845"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
         <source>Total time</source>
         <translation>Koguaeg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="903"/>
+        <location filename="../qt-ui/maintab.ui" line="932"/>
         <source>Gas consumption</source>
         <translation>Gaasi tarbimine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="962"/>
+        <location filename="../qt-ui/maintab.ui" line="991"/>
         <source>Extra data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="968"/>
+        <location filename="../qt-ui/maintab.ui" line="997"/>
         <source>Additional data from dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="54"/>
-        <location filename="../qt-ui/maintab.ui" line="458"/>
+        <location filename="../qt-ui/maintab.ui" line="83"/>
+        <location filename="../qt-ui/maintab.ui" line="487"/>
         <source>Date</source>
         <translation>Kuupäev</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="61"/>
+        <location filename="../qt-ui/maintab.ui" line="90"/>
         <source>Time</source>
         <translation>Aeg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="425"/>
+        <location filename="../qt-ui/maintab.ui" line="454"/>
         <source>Dive info</source>
         <translation>Sukeldumise info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="477"/>
+        <location filename="../qt-ui/maintab.ui" line="506"/>
         <source>Interval</source>
         <translation>Pinnaintervall</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="534"/>
-        <location filename="../qt-ui/maintab.ui" line="799"/>
+        <location filename="../qt-ui/maintab.ui" line="563"/>
+        <location filename="../qt-ui/maintab.ui" line="828"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="610"/>
+        <location filename="../qt-ui/maintab.ui" line="639"/>
         <source>Avg. depth</source>
         <translation>Keskmine sügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="572"/>
+        <location filename="../qt-ui/maintab.ui" line="601"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="734"/>
         <source>Salinity</source>
         <translation>Soolsus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="742"/>
+        <location filename="../qt-ui/maintab.ui" line="771"/>
         <source>Stats</source>
         <translation>Statistika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="775"/>
+        <location filename="../qt-ui/maintab.ui" line="804"/>
         <source>Depth</source>
         <translation>Sügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="787"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Temperature</source>
         <translation>Temperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="813"/>
+        <location filename="../qt-ui/maintab.ui" line="842"/>
         <source>Duration</source>
         <translation>Kestus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="864"/>
+        <location filename="../qt-ui/maintab.ui" line="893"/>
         <source>Dives</source>
         <translation>Sukeldumisi kokku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="948"/>
+        <location filename="../qt-ui/maintab.ui" line="977"/>
         <source>Photos</source>
         <translation>Fotod</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="95"/>
+        <location filename="../qt-ui/maintab.cpp" line="87"/>
         <source>Cylinders</source>
         <translation>Balloonid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="99"/>
+        <location filename="../qt-ui/maintab.cpp" line="91"/>
         <source>Weights</source>
         <translation>Raskused</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="55"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Apply changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="59"/>
+        <location filename="../qt-ui/maintab.cpp" line="50"/>
         <source>Discard changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="96"/>
+        <location filename="../qt-ui/maintab.cpp" line="88"/>
         <source>Add cylinder</source>
         <translation>Lisa balloon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="100"/>
+        <location filename="../qt-ui/maintab.cpp" line="92"/>
         <source>Add weight system</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="274"/>
+        <location filename="../qt-ui/maintab.cpp" line="276"/>
         <source>Air temp. [%1]</source>
         <translation>Õhu temp. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="275"/>
+        <location filename="../qt-ui/maintab.cpp" line="277"/>
         <source>Water temp. [%1]</source>
         <translation>Vee temp. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="312"/>
+        <location filename="../qt-ui/maintab.cpp" line="314"/>
         <source>This trip is being edited.</source>
         <translation>Seda väljasõitu toimetatakse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="320"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Multiple dives are being edited.</source>
         <translation>Mitut sukeldumist toimetatakse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.cpp" line="324"/>
         <source>This dive is being edited.</source>
         <translation>Seda sukeldumist toimetatakse.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="436"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
+        <location filename="../qt-ui/maintab.cpp" line="465"/>
         <source>Trip notes</source>
         <translation>Väljasõidu märkmed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="458"/>
+        <location filename="../qt-ui/maintab.cpp" line="463"/>
         <source>Trip location</source>
         <translation>Väljasõidu koht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="526"/>
-        <location filename="../qt-ui/maintab.cpp" line="558"/>
-        <location filename="../qt-ui/maintab.cpp" line="562"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
         <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="574"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="555"/>
+        <location filename="../qt-ui/maintab.cpp" line="563"/>
         <source>Deepest dive</source>
         <translation>Sügavaim sukeldumine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="556"/>
+        <location filename="../qt-ui/maintab.cpp" line="564"/>
         <source>Shallowest dive</source>
         <translation>Madalaim sukeldumine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="569"/>
+        <location filename="../qt-ui/maintab.cpp" line="577"/>
         <source>Highest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="578"/>
         <source>Lowest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="571"/>
+        <location filename="../qt-ui/maintab.cpp" line="579"/>
         <source>Average total SAC of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="582"/>
+        <location filename="../qt-ui/maintab.cpp" line="590"/>
         <source>Highest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="583"/>
+        <location filename="../qt-ui/maintab.cpp" line="591"/>
         <source>Lowest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="584"/>
+        <location filename="../qt-ui/maintab.cpp" line="592"/>
         <source>Average temperature of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="594"/>
+        <location filename="../qt-ui/maintab.cpp" line="602"/>
         <source>Longest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="595"/>
+        <location filename="../qt-ui/maintab.cpp" line="603"/>
         <source>Shortest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="596"/>
+        <location filename="../qt-ui/maintab.cpp" line="604"/>
         <source>Average length of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="620"/>
+        <location filename="../qt-ui/maintab.cpp" line="628"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -2858,17 +3057,17 @@ mixed from Air and using:
 õhust ja kasutades:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="624"/>
+        <location filename="../qt-ui/maintab.cpp" line="632"/>
         <source> and </source>
         <translation>ja</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="911"/>
+        <location filename="../qt-ui/maintab.cpp" line="925"/>
         <source>Discard the changes?</source>
         <translation>Loobu muudatustest?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="912"/>
+        <location filename="../qt-ui/maintab.cpp" line="926"/>
         <source>You are about to discard your changes.</source>
         <translation>Oled muudatustest loobumas.</translation>
     </message>
@@ -3015,7 +3214,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="296"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="232"/>
         <source>Open</source>
         <translation>Ava</translation>
     </message>
@@ -3375,90 +3574,90 @@ p, li { white-space: pre-wrap; }
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="252"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="229"/>
         <source>Open file</source>
         <translation>Ava fail</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="256"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="233"/>
         <source>Cancel</source>
         <translation>Loobu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="332"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="309"/>
         <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="444"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
         <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="491"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
         <source>Print runtime table</source>
         <translation>Väljasta jooksva aja tabel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="834"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="811"/>
         <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="836"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="813"/>
         <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="841"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="818"/>
         <source>Save changes?</source>
         <translation>Salvesta muudatused?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1196"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1173"/>
         <source>Save file as</source>
         <translation>Salvesta nimega</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1337"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1314"/>
         <source>Open dive log file</source>
         <translation>Ava sukeldumislogi fail</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="819"/>
         <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="300"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="444"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="277"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Warning</source>
         <translation>Hoiatus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1180"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1157"/>
         <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="625"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="602"/>
         <source>Yearly statistics</source>
         <translation>Aastane statistika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1197"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1174"/>
         <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="1338"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1315"/>
         <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Lõpeta praegune toimetamine enne järgmise alustamist.</translation>
     </message>
@@ -3466,7 +3665,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="651"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="634"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation type="unfinished"/>
     </message>
@@ -3474,39 +3673,39 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="239"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="243"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="244"/>
         <source>Not now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="245"/>
         <source>Update firmware</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
         <source>Firmware upgrade notice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
         <source>Save the downloaded firmware as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
         <source>HEX files (*.hex)</source>
         <translation type="unfinished"/>
     </message>
@@ -3514,54 +3713,69 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Open circuit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>ft/min</source>
         <translation>jalg/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="481"/>
         <source>Last stop at 20ft</source>
         <translation>Viimane peatus 20 jala peal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="482"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% keskmine sügavus 20 jalani</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="489"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
         <source>20ft to surface</source>
         <translation>20 jalga pinnani</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="485"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
         <source>Last stop at 6m</source>
         <translation>Viimane peatus 6m peal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% keskmine sügavus 6m-i</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="494"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
         <source>6m to surface</source>
         <translation>6m pinnani</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="497"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="498"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
         <source>cuft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="506"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="507"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="500"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="501"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
@@ -3681,6 +3895,7 @@ väärtused</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="816"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -3715,57 +3930,87 @@ väärtused</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="795"/>
+        <source>CCR: Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="809"/>
+        <source>Default CCR set-point for dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="832"/>
+        <source>pSCR O₂ metabolism rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="839"/>
+        <source>pSCR ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="846"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="859"/>
+        <source>1:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="875"/>
         <source>System default</source>
         <translation>Süsteemi vaikeväärtus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="843"/>
+        <location filename="../qt-ui/preferences.ui" line="914"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="849"/>
+        <location filename="../qt-ui/preferences.ui" line="920"/>
         <source>Proxy type</source>
         <translation>Proxy tüüp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="862"/>
+        <location filename="../qt-ui/preferences.ui" line="933"/>
         <source>Host</source>
         <translation>Peaarvuti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="888"/>
+        <location filename="../qt-ui/preferences.ui" line="959"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="914"/>
+        <location filename="../qt-ui/preferences.ui" line="985"/>
         <source>Requires authentication</source>
         <translation>Nõuab autentimist</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="934"/>
+        <location filename="../qt-ui/preferences.ui" line="1005"/>
         <source>Username</source>
         <translation>Kasutajanimi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="957"/>
+        <location filename="../qt-ui/preferences.ui" line="1028"/>
         <source>Password</source>
         <translation>Salasõna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="985"/>
-        <source>about:blank</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="1011"/>
-        <source>Disconnect from facebook</source>
+        <location filename="../qt-ui/preferences.ui" line="1079"/>
+        <source>Disconnect from Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="824"/>
+        <location filename="../qt-ui/preferences.ui" line="895"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
@@ -3920,52 +4165,52 @@ väärtused</translation>
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="28"/>
+        <location filename="../qt-ui/preferences.cpp" line="44"/>
         <source>No proxy</source>
         <translation>Pole proxyt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="29"/>
+        <location filename="../qt-ui/preferences.cpp" line="45"/>
         <source>System proxy</source>
         <translation>Süsteemi proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="30"/>
+        <location filename="../qt-ui/preferences.cpp" line="46"/>
         <source>HTTP proxy</source>
         <translation>HTTP proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="31"/>
+        <location filename="../qt-ui/preferences.cpp" line="47"/>
         <source>SOCKS proxy</source>
         <translation>SOCKS proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="291"/>
+        <location filename="../qt-ui/preferences.cpp" line="324"/>
         <source>Restart required</source>
         <translation>Nõutav taaskäivitus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="292"/>
+        <location filename="../qt-ui/preferences.cpp" line="325"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>Uue keele kasutuselevõtuks tuleb Subsurface taaskäivitada.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="456"/>
+        <location filename="../qt-ui/preferences.cpp" line="494"/>
         <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
         <translation>Kui klikid OK, siis kõik Subsurface seaded viiakse nende vaikeväärtustele. See toimub viivitamata.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML failid (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Open default log file</source>
         <translation>Ava vaikimisi logifail</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="455"/>
+        <location filename="../qt-ui/preferences.cpp" line="493"/>
         <source>Warning</source>
         <translation>Hoiatus</translation>
     </message>
@@ -3973,17 +4218,17 @@ väärtused</translation>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="91"/>
+        <location filename="../qt-ui/printdialog.cpp" line="85"/>
         <source>&amp;Preview</source>
         <translation>&amp;Eelvaade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="88"/>
+        <location filename="../qt-ui/printdialog.cpp" line="82"/>
         <source>P&amp;rint</source>
         <translation>P&amp;rindi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="103"/>
+        <location filename="../qt-ui/printdialog.cpp" line="97"/>
         <source>Print</source>
         <translation>Väljastus</translation>
     </message>
@@ -3991,42 +4236,42 @@ väärtused</translation>
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="20"/>
         <source>Dive#</source>
         <translation>Sukeldumise nr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="21"/>
         <source>Date</source>
         <translation>Kuupäev</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="22"/>
         <source>Depth</source>
         <translation>Sügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="23"/>
         <source>Duration</source>
         <translation>Kestus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Master</source>
         <translation>Master</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Buddy</source>
         <translation>Semu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="34"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Location</source>
         <translation>Asukoht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <location filename="../qt-ui/printlayout.cpp" line="63"/>
         <source>Subsurface cannot find a usable printer on this system!</source>
         <translation type="unfinished"/>
     </message>
@@ -4092,72 +4337,72 @@ väärtused</translation>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2095"/>
+        <location filename="../qt-ui/models.cpp" line="2101"/>
         <source>unknown</source>
         <translation>tundmatu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2100"/>
+        <location filename="../qt-ui/models.cpp" line="2106"/>
         <source>Dive #%1 - %2</source>
         <translation>Sukeldumine #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2103"/>
+        <location filename="../qt-ui/models.cpp" line="2109"/>
         <source>Max depth: %1 %2</source>
         <translation>Max sügavus: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2110"/>
+        <location filename="../qt-ui/models.cpp" line="2116"/>
         <source>Duration: %1 min</source>
         <translation>Kestus: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2115"/>
+        <location filename="../qt-ui/models.cpp" line="2121"/>
         <source>Gas used:</source>
         <translation>Kasutatud gaas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2117"/>
+        <location filename="../qt-ui/models.cpp" line="2123"/>
         <source>Tags:</source>
         <translation>Märgendid:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2119"/>
+        <location filename="../qt-ui/models.cpp" line="2125"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2121"/>
+        <location filename="../qt-ui/models.cpp" line="2127"/>
         <source>Weights:</source>
         <translation>Raskused:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2126"/>
+        <location filename="../qt-ui/models.cpp" line="2132"/>
         <source>Notes:</source>
         <translation>Märkmed:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2133"/>
+        <location filename="../qt-ui/models.cpp" line="2139"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2135"/>
+        <location filename="../qt-ui/models.cpp" line="2141"/>
         <source>Buddy:</source>
         <translation>Semu:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2137"/>
+        <location filename="../qt-ui/models.cpp" line="2143"/>
         <source>Suit:</source>
         <translation>Ülikond:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2139"/>
+        <location filename="../qt-ui/models.cpp" line="2145"/>
         <source>Viz:</source>
         <translation>Nähtavus:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2141"/>
+        <location filename="../qt-ui/models.cpp" line="2147"/>
         <source>Rating:</source>
         <translation>Hinne:</translation>
     </message>
@@ -4165,103 +4410,108 @@ väärtused</translation>
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="628"/>
         <source> (#%1 of %2)</source>
         <translation>(#%1 %2st)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="630"/>
+        <source>Unknown dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="647"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1168"/>
         <source>Make first divecomputer</source>
         <translation>Loo esimene sukeldumiskompuuter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Delete this divecomputer</source>
         <translation>Kustuta see sukeldumiskompuuter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1184"/>
         <source>Add gas change</source>
         <translation>Lisa gaasivahetus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1187"/>
         <source> (Tank %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1195"/>
         <source>Add set-point change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1197"/>
         <source>Add bookmark</source>
         <translation>Lisa järjehoidja</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
         <source>Remove event</source>
         <translation>Eemalda sündmus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1206"/>
         <source>Hide similar events</source>
         <translation>Peida sarnased sündmused</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1213"/>
         <source>Edit name</source>
         <translation>Toimeta nimi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1242"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1249"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1264"/>
         <source>Unhide all events</source>
         <translation>Peida kõik sündmused</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide events</source>
         <translation>Peida sündmused</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide all %1 events?</source>
         <translation>Peida kõik %1 sündmust?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1333"/>
         <source>Remove the selected event?</source>
         <translation>Eemalda valitud sündmus?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1334"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1424"/>
         <source>Edit name of bookmark</source>
         <translation>Toimeta järjehoidja nimi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
         <source>Custom name:</source>
         <translation>Kohandatud nimi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1430"/>
         <source>Name is too long!</source>
         <translation>Nimi on liiga pikk!</translation>
     </message>
@@ -4269,102 +4519,102 @@ väärtused</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>AIR</source>
         <translation>ÕHK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>OXYGEN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="208"/>
         <source>Remove this point</source>
         <translation>Eemalda punkt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="57"/>
         <source>Close</source>
         <translation>Sulge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="42"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="25"/>
         <source>Average</source>
         <translation>Keskmine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="45"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="28"/>
         <source>Minimum</source>
         <translation>Miinimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="48"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="31"/>
         <source>Maximum</source>
         <translation>Maksimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="297"/>
+        <location filename="../qt-ui/globe.cpp" line="296"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>Liigu kaardil soovitud kohta ja märgi topeltklikiga sukeldumiskoht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="525"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="526"/>
         <source>lbs</source>
         <translation>nael</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="550"/>
         <source>ft</source>
         <translation>jalg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="551"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="570"/>
+        <location filename="../qt-ui/models.cpp" line="574"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="571"/>
+        <location filename="../qt-ui/models.cpp" line="575"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="595"/>
+        <location filename="../qt-ui/models.cpp" line="599"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="596"/>
+        <location filename="../qt-ui/models.cpp" line="600"/>
         <source>cuft</source>
         <translation>kuupjalg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="513"/>
         <source>Invalid response from server</source>
         <translation>Vigane vastus serverilt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation>Oodatava XML märgendi  &apos;DiveDateReader&apos; asemel on &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="567"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation>Oodatud XML märgendit &apos;DiveDates&apos; ei leitud</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Vigane XML vastus. Rida %1: %2</translation>
     </message>
@@ -4372,12 +4622,12 @@ väärtused</translation>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1450"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1518"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1442"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -4391,12 +4641,12 @@ väärtused</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
-        <location filename="../qt-ui/simplewidgets.cpp" line="151"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="134"/>
         <source>New starting number</source>
         <translation>Uus algusnumber</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="149"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="132"/>
         <source>New number</source>
         <translation>Uus number</translation>
     </message>
@@ -4404,12 +4654,12 @@ väärtused</translation>
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1575"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1653"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1579"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1657"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -4488,12 +4738,12 @@ väärtused</translation>
         <translation>Mis kuupäev ja kellaaeg on pildil?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="276"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="259"/>
         <source>Open image file</source>
         <translation>Ava pildifail</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="278"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="261"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Pildifailid  (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -4546,7 +4796,7 @@ väärtused</translation>
     <name>SocialNetworkDialog</name>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="282"/>
-        <source>Dive Date: %1 
+        <source>Dive date: %1 
 </source>
         <translation type="unfinished"/>
     </message>
@@ -4570,7 +4820,7 @@ väärtused</translation>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="290"/>
-        <source>Dive Location: %1 
+        <source>Dive location: %1 
 </source>
         <translation type="unfinished"/>
     </message>
@@ -4687,47 +4937,47 @@ väärtused</translation>
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="329"/>
         <source>Webservice</source>
         <translation>Veebiteenus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="393"/>
         <source>Connecting...</source>
         <translation>Ühendab...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
         <source>Download finished</source>
         <translation>Allalaadimine lõppenud</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Download error: %1</source>
         <translation>Allalaadimise viga: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="436"/>
         <source>Connection error: </source>
         <translation>Ühenduse viga:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
         <source>Download successful</source>
         <translation>Allalaadimine õnnestus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="439"/>
         <source>Invalid user identifier!</source>
         <translation>Vale kasutaja ID!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="312"/>
         <source>Enter User ID and click Download</source>
         <translation>Sisesta kasutaja ID ja kliki Allalaadimisel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="442"/>
         <source>Cannot parse response!</source>
         <translation>Ei suuda vastust tuvastada</translation>
     </message>
@@ -4735,7 +4985,7 @@ väärtused</translation>
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="592"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="575"/>
         <source>Suits: </source>
         <translation type="unfinished"/>
     </message>
@@ -4743,7 +4993,7 @@ väärtused</translation>
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="119"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="116"/>
         <source>No suit set</source>
         <translation type="unfinished"/>
     </message>
@@ -4760,7 +5010,7 @@ väärtused</translation>
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="513"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="496"/>
         <source>Tags: </source>
         <translation type="unfinished"/>
     </message>
@@ -4768,7 +5018,7 @@ väärtused</translation>
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="144"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="141"/>
         <source>Empty tags</source>
         <translation type="unfinished"/>
     </message>
@@ -4776,17 +5026,17 @@ väärtused</translation>
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>Description</source>
         <translation>Kirjeldus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -4794,7 +5044,7 @@ väärtused</translation>
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="141"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="131"/>
         <source>Information</source>
         <translation>Info</translation>
     </message>
@@ -4802,7 +5052,7 @@ väärtused</translation>
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1090"/>
+        <location filename="../qt-ui/models.cpp" line="1094"/>
         <source> (%1 shown)</source>
         <translation type="unfinished"/>
     </message>
@@ -4810,72 +5060,72 @@ väärtused</translation>
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="64"/>
         <source>Check for updates.</source>
         <translation>Kontrolli kas on uuendusi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="66"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface ei saanud uurida uuenduste kohta.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="70"/>
         <source>The following error occurred:</source>
         <translation>Tekkis järgmine viga:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="72"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
         <source>Please check your internet connection.</source>
         <translation>Palun kontrolli oma netiühendust.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="85"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="84"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="88"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="95"/>
         <source>A new version of Subsurface is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="97"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
         <source>Latest version is %1, please check with your OS vendor for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="103"/>
         <source>Newest release version is </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="105"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
         <source>The server returned the following information:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="121"/>
         <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
         <source>Decline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="124"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
         <source>Accept</source>
         <translation>Kinnita</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="126"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="125"/>
         <source>Automatic check for updates</source>
         <translation type="unfinished"/>
     </message>
@@ -4883,13 +5133,13 @@ väärtused</translation>
 <context>
     <name>UserManual</name>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="55"/>
+        <location filename="../qt-ui/usermanual.cpp" line="54"/>
         <source>User Manual</source>
         <translation>Kasutusjuhend</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="72"/>
-        <location filename="../qt-ui/usermanual.cpp" line="78"/>
+        <location filename="../qt-ui/usermanual.cpp" line="71"/>
+        <location filename="../qt-ui/usermanual.cpp" line="77"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Ei leia Subsurface juhendit</translation>
     </message>
@@ -4967,85 +5217,85 @@ väärtused</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
         <source>
 Operating System: %1</source>
         <translation>
 Operatsioonisüsteem: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 CPU arhidektuur: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 Language: %1</source>
         <translation>
 Keel: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="93"/>
         <source>Should we ask you later?</source>
         <translation>Kas me peaksime sinult hiljem küsima?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Don&apos;t ask me again</source>
         <translation>Ära küsi minult uuesti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Ask later</source>
         <translation>Küsi hiljem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
         <source>Submit user survey.</source>
         <translation>Saada kasutusuuring.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask again?</source>
         <translation>Küsi uuesti?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="17"/>
         <source>Send</source>
         <translation>Saada</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>
 OS CPU Arhidektuur: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation>Subsurface ei suutnud kasutusuuringut edastada.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="121"/>
         <source>The following error occurred:</source>
         <translation>Tekkis järgmine viga:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>Please check your internet connection.</source>
         <translation>Palun kontrolli oma netiühendust.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="131"/>
         <source>Survey successfully submitted.</source>
         <translation>Kasutusuuring edastatad.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="136"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation>Uuenduste olemasolu kontrolli viga.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -5053,12 +5303,12 @@ OS CPU Arhidektuur: %1</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>Description</source>
         <translation>Kirjeldus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -5106,12 +5356,12 @@ OS CPU Arhidektuur: %1</translation>
         <translation>Üleslaadimine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="247"/>
         <source>Operation timed out</source>
         <translation>Toiming aegus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="268"/>
         <source>Transferring data...</source>
         <translation type="unfinished"/>
     </message>
@@ -5119,17 +5369,17 @@ OS CPU Arhidektuur: %1</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Type</source>
         <translation>Tüüp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Weight</source>
         <translation>Raskus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="496"/>
+        <location filename="../qt-ui/models.cpp" line="500"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Siin klikkides eemaldatakse raskuste süsteem.</translation>
     </message>
@@ -5137,19 +5387,19 @@ OS CPU Arhidektuur: %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1479"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1487"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1497"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1555"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1566"/>
         <source>Failed!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1506"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1576"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1580"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -5157,79 +5407,79 @@ OS CPU Arhidektuur: %1</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1841"/>
+        <location filename="../qt-ui/models.cpp" line="1847"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Aasta
  &gt; Kuu / väljasõit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1844"/>
+        <location filename="../qt-ui/models.cpp" line="1850"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1847"/>
+        <location filename="../qt-ui/models.cpp" line="1853"/>
         <source>Duration 
  Total</source>
         <translation>Kestus
 kokku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1850"/>
+        <location filename="../qt-ui/models.cpp" line="1856"/>
         <source>
 Average</source>
         <translation>
 Keskmine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1853"/>
+        <location filename="../qt-ui/models.cpp" line="1859"/>
         <source>
 Shortest</source>
         <translation>
 Lühim</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1856"/>
+        <location filename="../qt-ui/models.cpp" line="1862"/>
         <source>
 Longest</source>
         <translation>
 Pikim</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1859"/>
+        <location filename="../qt-ui/models.cpp" line="1865"/>
         <source>Depth (%1)
  Average</source>
         <translation>Sügavus (%1)
 keskmine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1862"/>
-        <location filename="../qt-ui/models.cpp" line="1871"/>
-        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>
 Minimum</source>
         <translation>
 Min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1865"/>
-        <location filename="../qt-ui/models.cpp" line="1874"/>
-        <location filename="../qt-ui/models.cpp" line="1883"/>
+        <location filename="../qt-ui/models.cpp" line="1871"/>
+        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>
 Maximum</source>
         <translation>
 Max</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1874"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
  keskmine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1883"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -5310,40 +5560,40 @@ Max</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1508"/>
+        <location filename="../dive.c" line="1530"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) või (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="464"/>
+        <location filename="../divelist.c" line="467"/>
         <location filename="../equipment.c" line="81"/>
-        <location filename="../planner.c" line="1060"/>
-        <location filename="../planner.c" line="1063"/>
+        <location filename="../planner.c" line="1081"/>
+        <location filename="../planner.c" line="1084"/>
         <source>air</source>
         <translation>õhk</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="192"/>
+        <location filename="../equipment.c" line="194"/>
         <source>integrated</source>
         <translation>integreeritud</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="193"/>
+        <location filename="../equipment.c" line="195"/>
         <source>belt</source>
         <translation>vöö</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="194"/>
+        <location filename="../equipment.c" line="196"/>
         <source>ankle</source>
         <translation>pahkluu</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="195"/>
+        <location filename="../equipment.c" line="197"/>
         <source>backplate weight</source>
         <translation>seljaplaadi kaal</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="196"/>
+        <location filename="../equipment.c" line="198"/>
         <source>clip-on</source>
         <translation>külgeriputatav</translation>
     </message>
@@ -5351,7 +5601,7 @@ Max</translation>
         <location filename="../file.c" line="112"/>
         <location filename="../file.c" line="434"/>
         <location filename="../file.c" line="506"/>
-        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="925"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>&apos;%s&apos; lugemine ebaõnnestus</translation>
     </message>
@@ -5408,9 +5658,9 @@ Max</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../file.c" line="869"/>
-        <location filename="../file.c" line="909"/>
-        <location filename="../file.c" line="1007"/>
+        <location filename="../file.c" line="870"/>
+        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="1016"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>CSV impordil on max toetatud veergude arv %d</translation>
     </message>
@@ -5581,27 +5831,27 @@ Max</translation>
         <translation>vale sündmuse nr</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="421"/>
+        <location filename="../libdivecomputer.c" line="419"/>
         <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="427"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Error registering the data</source>
         <translation>Viga andmete registreerimisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="433"/>
         <source>Error parsing the datetime</source>
         <translation>Viga kuupäeva ja aja tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Dive %d: %s</source>
         <translation>Sukeldumine %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="455"/>
+        <location filename="../libdivecomputer.c" line="454"/>
         <source>Error parsing the divetime</source>
         <translation>Viga põhjaaja tuvastamisel</translation>
     </message>
@@ -5611,156 +5861,156 @@ Max</translation>
         <translation>Viga max sügavuse tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="482"/>
+        <location filename="../libdivecomputer.c" line="483"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="501"/>
+        <location filename="../libdivecomputer.c" line="503"/>
         <source>Error parsing the gas mix count</source>
         <translation>Viga gaasisegude arvu tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="513"/>
+        <location filename="../libdivecomputer.c" line="515"/>
         <source>Error obtaining water salinity</source>
         <translation>Viga vee soolsuse saamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="521"/>
+        <location filename="../libdivecomputer.c" line="524"/>
         <source>Error obtaining surface pressure</source>
         <translation>Viga pinnarõhu saamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="545"/>
+        <location filename="../libdivecomputer.c" line="549"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="562"/>
+        <location filename="../libdivecomputer.c" line="569"/>
         <source>Error parsing the gas mix</source>
         <translation>Viga gaasisegu tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="569"/>
+        <location filename="../libdivecomputer.c" line="576"/>
         <source>Error parsing the samples</source>
         <translation>Viga proovide tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="706"/>
+        <location filename="../libdivecomputer.c" line="713"/>
         <source>Event: waiting for user action</source>
         <translation>Sündmus: ootan kasutaja sekkumist</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="714"/>
+        <location filename="../libdivecomputer.c" line="721"/>
         <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="778"/>
+        <location filename="../libdivecomputer.c" line="785"/>
         <source>Error registering the event handler.</source>
         <translation>Viga sündmuste draiveri registreerimisel.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="783"/>
+        <location filename="../libdivecomputer.c" line="790"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Viga tühistamise draiveri registreerimisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="804"/>
+        <location filename="../libdivecomputer.c" line="811"/>
         <source>Dive data import error</source>
         <translation>Viga sukeldumise andmete impordil</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="843"/>
+        <location filename="../libdivecomputer.c" line="850"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Ei saa luua libdivecomputer konteksti</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="850"/>
+        <location filename="../libdivecomputer.c" line="857"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Ei saa avada %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="858"/>
+        <location filename="../libdivecomputer.c" line="865"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="506"/>
+        <location filename="../parse-xml.c" line="516"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Imelik protsendilugem %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1760"/>
+        <location filename="../parse-xml.c" line="1770"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>&apos;%s&apos; tuvastamine ebaõnnestus</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1989"/>
-        <location filename="../parse-xml.c" line="2137"/>
+        <location filename="../parse-xml.c" line="1999"/>
+        <location filename="../parse-xml.c" line="2147"/>
         <source>Database query dm4_events failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1996"/>
-        <location filename="../parse-xml.c" line="2144"/>
+        <location filename="../parse-xml.c" line="2006"/>
+        <location filename="../parse-xml.c" line="2154"/>
         <source>Database query dm4_tags failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2318"/>
+        <location filename="../parse-xml.c" line="2328"/>
         <source>Database query shearwater_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2325"/>
+        <location filename="../parse-xml.c" line="2335"/>
         <source>Database query shearwater_changes failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2332"/>
+        <location filename="../parse-xml.c" line="2342"/>
         <source>Database query shearwater_profile_sample failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2451"/>
+        <location filename="../parse-xml.c" line="2461"/>
         <source>Database query cobalt_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2458"/>
+        <location filename="../parse-xml.c" line="2468"/>
         <source>Database query cobalt_buddies failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2465"/>
+        <location filename="../parse-xml.c" line="2475"/>
         <source>Database query cobalt_visibility failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2472"/>
+        <location filename="../parse-xml.c" line="2482"/>
         <source>Database query cobalt_location failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2479"/>
+        <location filename="../parse-xml.c" line="2489"/>
         <source>Database query cobalt_location (site) failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2486"/>
+        <location filename="../parse-xml.c" line="2496"/>
         <source>Database query cobalt_profile_sample failed.
 </source>
         <translation type="unfinished"/>
@@ -5773,17 +6023,17 @@ Max</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2168"/>
-        <location filename="../parse-xml.c" line="2189"/>
-        <location filename="../parse-xml.c" line="2508"/>
-        <location filename="../parse-xml.c" line="2527"/>
+        <location filename="../parse-xml.c" line="2178"/>
+        <location filename="../parse-xml.c" line="2199"/>
+        <location filename="../parse-xml.c" line="2518"/>
+        <location filename="../parse-xml.c" line="2537"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Andmebaasi päring ebaõnnestus &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2848"/>
+        <location filename="../parse-xml.c" line="2909"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Ei suuda avada stiililehte &amp;s</translation>
     </message>
@@ -5793,161 +6043,167 @@ Max</translation>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="820"/>
+        <location filename="../planner.c" line="841"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Ei leia gaasi %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="356"/>
+        <location filename="../planner.c" line="363"/>
         <source>Too many gas mixes</source>
         <translation>Liiga palju gaasisegusid</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="540"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation>Dekompressiooni arvutamine katkestatud liigse ajakulu tõttu</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="548"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation>põhineb väärtustel GFlow = %d ja GFhigh = %d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="544"/>
+        <location filename="../planner.c" line="551"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface sukeldumise plaan</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="548"/>
+        <location filename="../planner.c" line="555"/>
         <source>depth</source>
         <translation>sügavus</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="558"/>
         <source>runtime</source>
         <translation>jooksev aeg</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="554"/>
+        <location filename="../planner.c" line="561"/>
         <source>duration</source>
         <translation>kestus</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="557"/>
+        <location filename="../planner.c" line="564"/>
         <source>gas</source>
         <translation>gaas</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="594"/>
+        <location filename="../planner.c" line="601"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="602"/>
+        <location filename="../planner.c" line="609"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Üleminek %.*f %s-le %d:%02d min jooksul - jooksev aeg %d:%02u %s peal</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="615"/>
+        <location filename="../planner.c" line="622"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="622"/>
+        <location filename="../planner.c" line="629"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Püsi %.*f %s peal %d:%02d min - jooksev aeg %d:%02u %s peal</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="635"/>
+        <location filename="../planner.c" line="642"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="638"/>
-        <location filename="../planner.c" line="642"/>
+        <location filename="../planner.c" line="645"/>
+        <location filename="../planner.c" line="649"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="651"/>
+        <location filename="../planner.c" line="658"/>
         <source>(SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="676"/>
+        <location filename="../planner.c" line="683"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="678"/>
+        <location filename="../planner.c" line="685"/>
         <source>Switch gas to %s</source>
         <translation>Vaheta gaasiks %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="697"/>
+        <location filename="../planner.c" line="704"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="699"/>
+        <location filename="../planner.c" line="706"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="710"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="705"/>
+        <location filename="../planner.c" line="712"/>
         <source>Gas consumption:</source>
         <translation>Gaasi tarbimine:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="535"/>
-        <location filename="../planner.c" line="725"/>
-        <location filename="../planner.c" line="730"/>
-        <location filename="../planner.c" line="753"/>
+        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="732"/>
+        <location filename="../planner.c" line="737"/>
+        <location filename="../planner.c" line="762"/>
+        <location filename="../planner.c" line="772"/>
         <source>Warning:</source>
         <translation>Hoiatus:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="523"/>
+        <location filename="../planner.c" line="530"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="726"/>
+        <location filename="../planner.c" line="733"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>gaasi hulk on suurem kui määratud balloonis võimalik!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="731"/>
+        <location filename="../planner.c" line="738"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>pole piisavalt reservi gaasi jagamiseks tõusul!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="733"/>
+        <location filename="../planner.c" line="740"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s %s-st (%.0f%s/%.0f%s planeeritud tõusul)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="735"/>
+        <location filename="../planner.c" line="742"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s planeeritud tõusu jooksul) %s-st</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="759"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>kõrge pO₂ väärtus %.2f %d:%02u peal gaasiga %s sügavusel %.*f %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="1064"/>
+        <location filename="../planner.c" line="769"/>
+        <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="1085"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1099"/>
+        <location filename="../profile.c" line="1113"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -5956,70 +6212,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1102"/>
+        <location filename="../profile.c" line="1116"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1106"/>
+        <location filename="../profile.c" line="1120"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1112"/>
+        <location filename="../profile.c" line="1126"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1115"/>
+        <location filename="../profile.c" line="1129"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1117"/>
+        <location filename="../profile.c" line="1131"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1119"/>
+        <location filename="../profile.c" line="1133"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1121"/>
+        <location filename="../profile.c" line="1135"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1123"/>
+        <location filename="../profile.c" line="1137"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1140"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1147"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -6028,7 +6284,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1137"/>
+        <location filename="../profile.c" line="1151"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -6037,143 +6293,143 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1149"/>
+        <location filename="../profile.c" line="1163"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Ohutuspeatus: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1152"/>
+        <location filename="../profile.c" line="1166"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Ohutuspeatus: teadmata aeg @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1157"/>
+        <location filename="../profile.c" line="1171"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1174"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deko: teadmata aeg @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1178"/>
         <source>In deco
 </source>
         <translation>Dekos
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1166"/>
+        <location filename="../profile.c" line="1180"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1183"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1172"/>
+        <location filename="../profile.c" line="1186"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (arvutatud)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1180"/>
+        <location filename="../profile.c" line="1194"/>
         <source>In deco (calc)
 </source>
         <translation>Dekos (arvutatud)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1196"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (arvutatud)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1185"/>
+        <location filename="../profile.c" line="1199"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (arvutatud)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1188"/>
+        <location filename="../profile.c" line="1202"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Arvutatud lagi %.0f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1194"/>
+        <location filename="../profile.c" line="1208"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Kude %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1214"/>
         <source>heartbeat: %d
 </source>
         <translation>Pulss: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1202"/>
+        <location filename="../profile.c" line="1216"/>
         <source>bearing: %d
 </source>
         <translation>Kurss: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1205"/>
+        <location filename="../profile.c" line="1219"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1314"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1304"/>
-        <location filename="../profile.c" line="1308"/>
-        <location filename="../profile.c" line="1312"/>
+        <location filename="../profile.c" line="1318"/>
+        <location filename="../profile.c" line="1322"/>
+        <location filename="../profile.c" line="1326"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1316"/>
+        <location filename="../profile.c" line="1330"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1334"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1324"/>
-        <location filename="../profile.c" line="1328"/>
+        <location filename="../profile.c" line="1338"/>
+        <location filename="../profile.c" line="1342"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1335"/>
+        <location filename="../profile.c" line="1349"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -6304,6 +6560,7 @@ EADD: %d%s
     </message>
     <message>
         <location filename="../dive.c" line="30"/>
+        <location filename="../equipment.c" line="85"/>
         <source>oxygen</source>
         <translation type="unfinished"/>
     </message>
@@ -6358,97 +6615,97 @@ EADD: %d%s
         <translation>(pole sukeldumisi)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sun</source>
         <translation>Pühap</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Mon</source>
         <translation>Esmasp</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Tue</source>
         <translation>Teisip</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Wed</source>
         <translation>Kolmap</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Thu</source>
         <translation>Neljap</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Fri</source>
         <translation>Reede</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sat</source>
         <translation>Laup</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jan</source>
         <translation>Jaan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Feb</source>
         <translation>Veebr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Mar</source>
         <translation>Märts</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jun</source>
         <translation>Juuni</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Jul</source>
         <translation>Juuli</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Sep</source>
         <translation>Sept</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Dec</source>
         <translation>Dets</translation>
     </message>
@@ -7051,13 +7308,13 @@ Kas Uemis Zurich on ühendatud korrektselt?</translation>
         <translation>Planeerimine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
         <source>GF low</source>
         <translation>GF madal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>%</source>
         <translation>%</translation>
     </message>
@@ -7067,7 +7324,7 @@ Kas Uemis Zurich on ühendatud korrektselt?</translation>
         <translation>GF kõrge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="335"/>
         <source>Drop to first depth</source>
         <translation>Lasku esimesele sügavusele</translation>
     </message>
@@ -7077,69 +7334,69 @@ Kas Uemis Zurich on ühendatud korrektselt?</translation>
         <translation>Viimane peatus 6m peal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
         <source>Plan backgas breaks</source>
         <translation>planeeri põhigaasi pausid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="355"/>
         <source>Gas options</source>
         <translation>Gaasi valikud</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="376"/>
         <source>Bottom SAC</source>
         <translation>SAC põhjas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="383"/>
         <source>Deco SAC</source>
         <translation>Deko SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="380"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="390"/>
         <source>Bottom pO₂</source>
         <translation>Põhja pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="403"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="413"/>
         <source>Deco pO₂</source>
         <translation>Deco pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="449"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="462"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="478"/>
         <source>Dive notes</source>
         <translation>Sukeldumise märkmed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
         <source>Display runtime</source>
         <translation>Kuva jooksev aeg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <source>Display segment duration</source>
         <translation>Kuva segmendi kestust</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="531"/>
         <source>Display transitions in deco</source>
         <translation>Kuva üleminekud dekos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="538"/>
         <source>Verbatim dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="387"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="410"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="397"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -7159,17 +7416,17 @@ Kas Uemis Zurich on ühendatud korrektselt?</translation>
         <translation>6m pinnani</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="499"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>Näita sukeldumise plaanis peatuste jooksvat (tõelist) aega</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="515"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>Näita sukeldumiste plaanis peatuste pikkust (suhtelist aega)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>Näita sukeldumiste plaanis üleminekuid või käsitle neid peidetuna</translation>
     </message>
diff --git a/translations/subsurface_fi_FI.ts b/translations/subsurface_fi_FI.ts
index f2b5c4979..240eb7e55 100644
--- a/translations/subsurface_fi_FI.ts
+++ b/translations/subsurface_fi_FI.ts
@@ -3,12 +3,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="539"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="522"/>
         <source>Person: </source>
         <translation>Henkilö:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="540"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="523"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Etsii sukelluskavereita ja -kouluttajia</translation>
     </message>
@@ -16,40 +16,188 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="233"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="230"/>
         <source>No buddies</source>
         <translation>Ei kavereita</translation>
     </message>
 </context>
 <context>
+    <name>ColumnNameProvider</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>GPS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Avg depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="210"/>
+        <location filename="../configuredivecomputer.cpp" line="212"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation>Backup -tiedoston %1 tallennus  epäonnistui. Virheviesti: %2</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="226"/>
+        <location filename="../configuredivecomputer.cpp" line="228"/>
         <source>Could not open backup file: %1</source>
         <translation>Backup -tiedoston avaus epäonnistui: %1</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="542"/>
+        <location filename="../configuredivecomputer.cpp" line="552"/>
         <source>Dive computer details read successfully</source>
         <translation>Sukellustietokoneen tiedot luettu onnistuneesti</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="551"/>
+        <location filename="../configuredivecomputer.cpp" line="561"/>
         <source>Setting successfully written to device</source>
         <translation>Asetuksen tallennus laitteeseen onnistui</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="560"/>
+        <location filename="../configuredivecomputer.cpp" line="570"/>
         <source>Device firmware successfully updated</source>
         <translation>Laitteen ohjelmisto on päivitetty onnistuneesti</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="569"/>
+        <location filename="../configuredivecomputer.cpp" line="579"/>
         <source>Device settings successfully reset</source>
         <translation>Laitteen asetukset on palautettu onnistuneesti</translation>
     </message>
@@ -847,72 +995,72 @@
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1053"/>
         <source>Backup files (*.xml)</source>
         <translation>Varmuustiedostot (*.xml)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1037"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>Virhe tallennettaessa varmistustiedostoa.
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1040"/>
         <source>Backup succeeded</source>
         <translation>Varmistus onnistui</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1041"/>
         <source>Your settings have been saved to: %1</source>
         <translation>Asetuksesi on tallennettu: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1030"/>
         <source>Backup dive computer settings</source>
         <translation>Varmuuskopioi sukellustietokoneen asetukset</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1036"/>
         <source>XML backup error</source>
         <translation>Virhe XML-varmuuskopioinnissa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1052"/>
         <source>Restore dive computer settings</source>
         <translation>Palauta sukellustietokoneen asetukset</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1056"/>
         <source>XML restore error</source>
         <translation>XML-tiedoston palautuksessa virhe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1057"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>Virhe varmistustiedoston palautuksessa.
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1063"/>
         <source>Restore succeeded</source>
         <translation>Palautus onnistui</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1064"/>
         <source>Your settings have been restored successfully.</source>
         <translation>Asetuksesi on palautettu onnistuneesti.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1074"/>
         <source>Select firmware file</source>
         <translation>Valitse laiteohjelmiston tiedosto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1075"/>
         <source>All files (*.*)</source>
         <translation>Kaikki tiedostot (*.*)</translation>
     </message>
@@ -970,12 +1118,12 @@
         <translation>Poista säiliö.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="410"/>
         <source>Cylinder cannot be removed</source>
         <translation>Säiliötä ei voida poistaa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="407"/>
+        <location filename="../qt-ui/models.cpp" line="411"/>
         <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>
@@ -1051,12 +1199,12 @@
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="48"/>
         <source>Remove the selected dive computer?</source>
         <translation>Poistetaanko valittu sukellustietokone?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="49"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
         <translation>Oletko varma, että haluat
@@ -1071,22 +1219,22 @@ poistaa valitun sukellustietokoneen?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Model</source>
         <translation>Malli</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Device ID</source>
         <translation>Laite ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Nickname</source>
         <translation>Lempinimi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Poista sukellustietokone.</translation>
     </message>
@@ -1094,117 +1242,145 @@ poistaa valitun sukellustietokoneen?</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="115"/>
         <source>Bailing out to OC</source>
         <translation>Vaihto avoimeen ilman kiertoon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="117"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>alku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>loppu</translation>
     </message>
 </context>
 <context>
+    <name>DiveImportedModel</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="556"/>
+        <source>Date/time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
+        <source>Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>h:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>min</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1242"/>
+        <location filename="../qt-ui/models.cpp" line="1248"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1245"/>
+        <location filename="../qt-ui/models.cpp" line="1251"/>
         <source>Date</source>
         <translation>Ajankohta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1248"/>
+        <location filename="../qt-ui/models.cpp" line="1254"/>
         <source>Rating</source>
         <translation>Yleisarvio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Depth(%1)</source>
         <translation>Syvyys(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1254"/>
+        <location filename="../qt-ui/models.cpp" line="1260"/>
         <source>Duration</source>
         <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1263"/>
         <source>Temp(%1%2)</source>
         <translation>Lämpötila(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>Weight(%1)</source>
         <translation>Massa(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>lbs</source>
         <translation>pauna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1263"/>
+        <location filename="../qt-ui/models.cpp" line="1269"/>
         <source>Suit</source>
         <translation>Puku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1266"/>
+        <location filename="../qt-ui/models.cpp" line="1272"/>
         <source>Cyl</source>
         <translation>Säiliöt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1269"/>
+        <location filename="../qt-ui/models.cpp" line="1275"/>
         <source>Gas</source>
         <translation>Kaasu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>SAC(%1)</source>
         <translation>Pintakulutus(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1277"/>
+        <location filename="../qt-ui/models.cpp" line="1283"/>
         <source>OTU</source>
         <translation>Happikertymä (OTU)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1280"/>
+        <location filename="../qt-ui/models.cpp" line="1286"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1283"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>Location</source>
         <translation>Kohde</translation>
     </message>
@@ -1212,87 +1388,87 @@ poistaa valitun sukellustietokoneen?</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="787"/>
+        <location filename="../qt-ui/divelistview.cpp" line="768"/>
         <source>Expand all</source>
         <translation>Laajenna kaikki retket</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="788"/>
+        <location filename="../qt-ui/divelistview.cpp" line="769"/>
         <source>Collapse all</source>
         <translation>Supista kaikki retket</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="789"/>
+        <location filename="../qt-ui/divelistview.cpp" line="770"/>
         <source>Collapse others</source>
         <translation>Tiivistä muut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="791"/>
+        <location filename="../qt-ui/divelistview.cpp" line="772"/>
         <source>Remove dive(s) from trip</source>
         <translation>Erota sukellukset retkestä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="792"/>
+        <location filename="../qt-ui/divelistview.cpp" line="773"/>
         <source>Create new trip above</source>
         <translation>Liitä uuteen retkeen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="806"/>
+        <location filename="../qt-ui/divelistview.cpp" line="787"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Lisää sukellukset yläpuoliseen retkeen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="808"/>
+        <location filename="../qt-ui/divelistview.cpp" line="789"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Lisää sukellukset alapuoliseen retkeen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="812"/>
+        <location filename="../qt-ui/divelistview.cpp" line="793"/>
         <source>Merge trip with trip above</source>
         <translation>Liitä retki yllä olevaan retkeen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="813"/>
+        <location filename="../qt-ui/divelistview.cpp" line="794"/>
         <source>Merge trip with trip below</source>
         <translation>Liitä retki alla olevaan retkeen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="817"/>
+        <location filename="../qt-ui/divelistview.cpp" line="798"/>
         <source>Delete dive(s)</source>
         <translation>Poista sukellukset</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="819"/>
+        <location filename="../qt-ui/divelistview.cpp" line="800"/>
         <source>Mark dive(s) invalid</source>
         <translation>Merkitse sukellukset epäkelvoiksi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="823"/>
+        <location filename="../qt-ui/divelistview.cpp" line="804"/>
         <source>Merge selected dives</source>
         <translation>Uhdistä valitut sukellukset</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="825"/>
+        <location filename="../qt-ui/divelistview.cpp" line="806"/>
         <source>Renumber dive(s)</source>
         <translation>Numeroi uudelleen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="826"/>
+        <location filename="../qt-ui/divelistview.cpp" line="807"/>
         <source>Shift times</source>
         <translation>Muuta aikoja</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="827"/>
+        <location filename="../qt-ui/divelistview.cpp" line="808"/>
         <source>Load images</source>
         <translation>Lataa kuvat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Open image files</source>
         <translation>Avaa kuvatiedostot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Kuvatiedostot (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -1477,100 +1653,100 @@ poistaa valitun sukellustietokoneen?</translation>
         <translation>Hiekka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF -tiedostot (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="268"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>CSV tiedostot (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="68"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Yleinen tiedostomuoto, jota käytetään sukelluslokien siirtämisessä eri sukellusohjelmistojen välillä.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>Pilkulla erotettu lista, joka kuvaa sukelluksen syvyysprofiilin.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation>Pilkuilla erotettu lista sukelluksen tiedoista. Tässä on mukana suurin osa tiedoista, mutta ei sukellusprofiilia.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Lähetä sukellustiedot divelogs.de -verkkopalveluun.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>Lähetä sukellustiedot dive-share.appspot.com -verkkopalveluun</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>Tallenna sukelluskohteet HTML -tiedostoon, joka näyttää sijainnit maailmankartalla.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurfacen oma XML -tiedostomuoto.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
         <source>Write depths of images to file.</source>
         <translation>Tallenna kuvien syvyydet tiedostoon.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export UDDF file as</source>
         <translation>Vienti UDDF -tiedostoon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="267"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
         <source>Export CSV file as</source>
         <translation>Vienti CSV -tiedostoon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="278"/>
         <source>Export world map</source>
         <translation>Vie maailmankartta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="299"/>
         <source>HTML files (*.html)</source>
         <translation>HTML -tiedostot (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="283"/>
         <source>Export Subsurface XML</source>
         <translation>Vie Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="284"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML -tiedostot (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
         <source>Save image depths</source>
         <translation>Tallenna kuvien syvyydet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="298"/>
         <source>Export HTML files as</source>
         <translation>Vie HTML -tiedostoihin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
         <source>Can&apos;t open file %s</source>
         <translation>Tiedoston avaus ei onnistu %s</translation>
     </message>
@@ -1583,248 +1759,228 @@ poistaa valitun sukellustietokoneen?</translation>
         <translation>Liitä sukellusloki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
-        <source>CSV options</source>
-        <translation>CSV -asetukset</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="281"/>
-        <source>Pre-configured imports</source>
-        <translation>Esiasetetut tuonnit</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="122"/>
-        <source>Depth</source>
-        <translation>Syvyys</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="142"/>
-        <source>Stopdepth</source>
-        <translation>Pysähdyssyvyys</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="162"/>
-        <source>Pressure</source>
-        <translation>Paine</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="176"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="466"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
         <source>Time</source>
         <translation>Kello</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="183"/>
-        <source>Temp</source>
-        <translation>Lämpötila</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="213"/>
-        <source>NDL</source>
-        <translation>NDL</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="233"/>
-        <source>TTS</source>
-        <translation>TTS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="253"/>
-        <source>Cns</source>
-        <translation>Cns</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="58"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="789"/>
-        <source>Field separator</source>
-        <translation>Kentän erotin</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="35"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="363"/>
-        <source>Units</source>
-        <translation>Yksiköt</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="42"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="370"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="97"/>
         <source>Metric</source>
         <translation>Metrinen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="47"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="375"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="102"/>
         <source>Imperial</source>
         <translation>Brittiläinen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="169"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="298"/>
-        <source>Manual dives</source>
-        <translation>Vapaa CSV -tiedostosta tuonti</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="316"/>
-        <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source>
-        <translation>Valitse päivämäärän muoto (päivä, kuukausi ja vuosi). Kenttien erotin voi olla mikä tahansa merkeistä .-/.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="319"/>
-        <source>Date format</source>
-        <translation>Päiväyksen muoto</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="332"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="59"/>
         <source>dd.mm.yyyy</source>
         <translation>pp.kk.vvvv</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="337"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="64"/>
         <source>mm/dd/yyyy</source>
         <translation>kk/pp/vvvv</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="342"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="69"/>
         <source>yyyy-mm-dd</source>
         <translation>vvvv-kk-pp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="392"/>
-        <source>Dive #</source>
-        <translation>Sukellus</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="426"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="439"/>
-        <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source>
-        <translation>Päiväys valitussa muodossa (esim. pp.kk.vvvv)</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+        <source>Dive #</source>
+        <translation>Sukellus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="429"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
         <source>Date</source>
         <translation>Ajankohta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="500"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="513"/>
-        <source>Dive duration in seconds or in min:sec format</source>
-        <translation>Sukelluksen kesto sekunneissa min:sek muodossa</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="503"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
         <source>Duration</source>
         <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="574"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="591"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
         <source>Tags</source>
         <translation>Avainsanat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="608"/>
-        <source>Cyl size</source>
-        <translation>Säiliön koko</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="625"/>
-        <source>Air temp</source>
-        <translation>Ilman lämpötila</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="642"/>
-        <source>Start Pressure</source>
-        <translation>Alkupaine</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="659"/>
-        <source>Water temp</source>
-        <translation>Veden lämpötila</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="676"/>
-        <source>End Press</source>
-        <translation>Loppupaine</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="693"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
         <source>O₂</source>
         <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="710"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
         <source>He</source>
         <translation>He</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="742"/>
-        <source>Choose duration format.</source>
-        <translation>Valitse keston muoto</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="745"/>
-        <source>Duration format</source>
-        <translation>Keston muoto</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="758"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="78"/>
         <source>Seconds</source>
         <translation>Sekuntia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="763"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
         <source>Minutes</source>
         <translation>Minuuttia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="768"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="88"/>
         <source>Minutes:seconds</source>
         <translation>Minuutit:sekunnit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="540"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
         <source>Location</source>
         <translation>Kohde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="409"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
         <source>Max depth</source>
         <translation>Suurin syvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="386"/>
-        <source>Field configuration</source>
-        <translation>Kentän määritys</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+        <source>Tab</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+        <source>Samples pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
         <source>Mean depth</source>
         <translation>Keskisyvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="483"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
         <source>Buddy</source>
         <translation>Sukelluspari</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="523"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
         <source>Notes</source>
         <translation>Muistiinpanot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="557"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
         <source>Weight</source>
         <translation>Painot</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DivePlanner</name>
@@ -1867,42 +2023,42 @@ poistaa valitun sukellustietokoneen?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
         <source>unknown</source>
         <translation>tuntematon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="691"/>
         <source>Final depth</source>
         <translation>Lopullinen syvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="693"/>
         <source>Run time</source>
         <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="701"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="695"/>
         <source>Duration</source>
         <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="703"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
         <source>Used gas</source>
         <translation>Käytetty kaasuseos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="705"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
         <source>CC set point</source>
         <translation>CCR-asetuspiste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1044"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1051"/>
         <source>Discard the plan?</source>
         <translation>Hylätäänkö suunnitelma?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1045"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1052"/>
         <source>You are about to discard your plan.</source>
         <translation>Olet hylkäämässä suunnitelmasi.</translation>
     </message>
@@ -1910,22 +2066,22 @@ poistaa valitun sukellustietokoneen?</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="257"/>
         <source>Dive planner points</source>
         <translation>Sukellussuunnitelman etappipisteet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="261"/>
         <source>Available gases</source>
         <translation>Mahdolliset kaasut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="284"/>
         <source>Add dive data point</source>
         <translation>Lisää sukellusetappi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="304"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="293"/>
         <source>Save new</source>
         <translation>Tallenna uusi</translation>
     </message>
@@ -1933,92 +2089,112 @@ poistaa valitun sukellustietokoneen?</translation>
 <context>
     <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Depth</source>
         <translation>Syvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
         <source>Time</source>
         <translation>Kello</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
         <source>Pressure</source>
         <translation>Paine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>Temperature</source>
         <translation>Lämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
         <source>Color</source>
         <translation>Väri</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
         <source>Pressure S</source>
         <translation>Sensoripaine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
+        <source>Setpoint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
+        <source>Sensor1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
+        <source>Sensor2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
+        <source>Sensor3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
         <source>Ambient pressure</source>
         <translation>Ympäröivä paine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
-        <source>Heart Beat</source>
-        <translation>Syke</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
+        <source>Heart beat</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
-        <source>Gradient Factor</source>
-        <translation>Gradient Factor</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/>
+        <source>Gradient factor</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
-        <source>Mean Depth/s</source>
-        <translation>Keskisyvyys/s</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
+        <source>Mean depth/s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
         <source>Pressure I</source>
         <translation>Arvioitu paine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
         <source>User entered</source>
         <translation>Käyttäjän syöttämä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
         <source>Cylinder index</source>
         <translation>Säiliöindeksi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
         <source>Ceiling</source>
         <translation>Katto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
         <source>SAC</source>
         <translation>Pintakulutus</translation>
     </message>
@@ -2069,127 +2245,127 @@ poistaa valitun sukellustietokoneen?</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1437"/>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1443"/>
+        <location filename="../qt-ui/models.cpp" line="1489"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1440"/>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1492"/>
         <source>Date</source>
         <translation>Ajankohta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1443"/>
-        <location filename="../qt-ui/models.cpp" line="1489"/>
+        <location filename="../qt-ui/models.cpp" line="1449"/>
+        <location filename="../qt-ui/models.cpp" line="1495"/>
         <source>Rating</source>
         <translation>Yleisarvio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1452"/>
         <source>Depth</source>
         <translation>Syvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1458"/>
         <source>Temp</source>
         <translation>Lämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1461"/>
         <source>Weight</source>
         <translation>Painot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>SAC</source>
         <translation>Pintakulutus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>Weight(%1)</source>
         <translation>Massa(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1458"/>
-        <location filename="../qt-ui/models.cpp" line="1504"/>
+        <location filename="../qt-ui/models.cpp" line="1464"/>
+        <location filename="../qt-ui/models.cpp" line="1510"/>
         <source>Suit</source>
         <translation>Puku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1461"/>
-        <location filename="../qt-ui/models.cpp" line="1507"/>
+        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1513"/>
         <source>Cyl</source>
         <translation>Säiliöt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1464"/>
-        <location filename="../qt-ui/models.cpp" line="1510"/>
+        <location filename="../qt-ui/models.cpp" line="1470"/>
+        <location filename="../qt-ui/models.cpp" line="1516"/>
         <source>Gas</source>
         <translation>Kaasu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>SAC(%1)</source>
         <translation>Pintakulutus(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1473"/>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1527"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
-        <location filename="../qt-ui/models.cpp" line="1524"/>
+        <location filename="../qt-ui/models.cpp" line="1482"/>
+        <location filename="../qt-ui/models.cpp" line="1530"/>
         <source>Location</source>
         <translation>Kohde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>Depth(%1)</source>
         <translation>Syvyys(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1449"/>
-        <location filename="../qt-ui/models.cpp" line="1495"/>
+        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1501"/>
         <source>Duration</source>
         <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1498"/>
+        <location filename="../qt-ui/models.cpp" line="1504"/>
         <source>Temp(%1%2)</source>
         <translation>Lämpötila(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>lbs</source>
         <translation>pauna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1470"/>
-        <location filename="../qt-ui/models.cpp" line="1518"/>
+        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1524"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -2197,95 +2373,95 @@ poistaa valitun sukellustietokoneen?</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="98"/>
         <source>no dives were selected</source>
         <translation>sukelluksia ei ole valittu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="117"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>zip -tiedoston luonti vientiä varten epäonnistui: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="143"/>
         <source>cannot create temporary file: %s</source>
         <translation>väliaikaistiedoston luominen ei onnistu: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/>
         <source>internal error: %s</source>
         <translation>sisäinen virhe: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="169"/>
         <source>internal error</source>
         <translation>sisäinen virhe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="629"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="828"/>
         <source>Done</source>
         <translation>Valmis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/>
         <source>Uploading dive list...</source>
         <translation>Lähetetään sukelluslokia...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="692"/>
         <source>Downloading dive list...</source>
         <translation>Ladataan sukelluslokia...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="741"/>
         <source>Downloading %1 dives...</source>
         <translation>Ladataan %1 sukellusta...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="785"/>
         <source>Download finished - %1</source>
         <translation>Lataus päättynyt - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="802"/>
         <source>Corrupted download</source>
         <translation>Lataus on korruptoitunut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Pakattua tiedostoa ei voitu avata:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
         <source>Upload failed</source>
         <translation>Lähetys epäonnistui</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/>
         <source>Upload successful</source>
         <translation>Lähetys onnistui</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
         <source>Login failed</source>
         <translation>Kirjautuminen epäonnistui</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
         <source>Cannot parse response</source>
         <translation>Vastauksen jäsentäminen ei onnistu!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
         <source>Error: %1</source>
         <translation>Virhe: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="829"/>
         <source>Upload finished</source>
         <translation>Lähetys valmistui</translation>
     </message>
@@ -2293,54 +2469,52 @@ poistaa valitun sukellustietokoneen?</translation>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="169"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="400"/>
         <source>Retry</source>
         <translation>Yritä uudestaan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="264"/>
         <source>Find Uemis dive computer</source>
         <translation>Etsi Uemis -sukellustietokone</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Valitse lokitiedosto sukellustietokoneen purun tietojen tallennukseen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Log files (*.log)</source>
         <translation>Lokitiedostot (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="362"/>
         <source>Warning</source>
         <translation>Varoitus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="363"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>Kun sukellustietokoneen latauksesta tallennetaan raakatiedosto, sukelluksia EI tallenneta sukelluslistaan.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="374"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Valitse tiedosto sukellustietokoneen latauksen raakatiedostolle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="375"/>
         <source>Dump files (*.bin)</source>
         <translation>Raakatiedostot (*.bin)</translation>
     </message>
@@ -2348,7 +2522,7 @@ poistaa valitun sukellustietokoneen?</translation>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="101"/>
         <source>Vendor</source>
         <translation>Valmistaja</translation>
     </message>
@@ -2358,54 +2532,74 @@ poistaa valitun sukellustietokoneen?</translation>
         <translation>Hae sukellustietokoneelta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="31"/>
         <source>Device or mount point</source>
         <translation>Laite- tai hakemistopolku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="111"/>
         <source>Dive computer</source>
         <translation>Sukellustietokone</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="132"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="45"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="80"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="94"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="52"/>
         <source>Force download of all dives</source>
         <translation>Lataa kaikki sukellukset</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
         <source>Always prefer downloaded dives</source>
         <translation>Suosi aina ladattuja sukelluksia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="189"/>
         <source>Cancel</source>
         <translation>Peruuta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/>
+        <source>Downloaded Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
+        <source>Select all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
+        <source>Unselect all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
         <source>Save libdivecomputer logfile</source>
         <translation>Tallenna sukellustietokoneen lokitiedosto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="87"/>
         <source>Save libdivecomputer dumpfile</source>
         <translation>Tallenna sukellustietokoneen raakatiedosto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
         <source>Download into new trip</source>
         <translation>Lataa uuteen rekteen</translation>
     </message>
@@ -2413,12 +2607,12 @@ poistaa valitun sukellustietokoneen?</translation>
 <context>
     <name>ExtraDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Key</source>
         <translation>Avain</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Value</source>
         <translation>Arvo</translation>
     </message>
@@ -2432,22 +2626,20 @@ poistaa valitun sukellustietokoneen?</translation>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="245"/>
-        <source>Your dive profile was updated to facebook.</source>
-        <translation>Sukellusprofiilis päivitettiin Facebookiin.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
-        <source>Photo Upload Failed</source>
-        <translation>Kuvien lähetys epäonnistui</translation>
+        <source>Your dive profile was updated to Facebook.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="250"/>
-        <source>Your dive profile was not updated to facebook, 
+        <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
-        <translation>Sukellusprofiiliasi ei päivitetty Facebookiin,
-ole hyvä ja lähetä seuraava tieto kehittäjille.
-</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+        <source>Photo Upload Failed</source>
+        <translation>Kuvien lähetys epäonnistui</translation>
     </message>
 </context>
 <context>
@@ -2489,17 +2681,17 @@ ole hyvä ja lähetä seuraava tieto kehittäjille.
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1544"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1621"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Ominaisuus ei ole vielä saatavilla valitulle sukellustietokoneelle.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1624"/>
         <source>Firmware update failed!</source>
         <translation>Laiteohjelmiston päivitys epäonnistui!</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1550"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1627"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Yhteys sukellustietokoneeseen epäonnistui.</translation>
     </message>
@@ -2507,7 +2699,7 @@ ole hyvä ja lähetä seuraava tieto kehittäjille.
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="128"/>
+        <location filename="../qt-ui/globe.cpp" line="119"/>
         <source>Edit selected dive locations</source>
         <translation>Muokkaa valittuja sukelluskohteita</translation>
     </message>
@@ -2515,7 +2707,7 @@ ole hyvä ja lähetä seuraava tieto kehittäjille.
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="566"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="549"/>
         <source>Location: </source>
         <translation>Sijainti:</translation>
     </message>
@@ -2523,7 +2715,7 @@ ole hyvä ja lähetä seuraava tieto kehittäjille.
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="286"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="283"/>
         <source>No location set</source>
         <translation>Sijaintia ei asetettu</translation>
     </message>
@@ -2531,330 +2723,335 @@ ole hyvä ja lähetä seuraava tieto kehittäjille.
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="133"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
+        <location filename="../qt-ui/maintab.cpp" line="497"/>
         <source>Location</source>
         <translation>Kohde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="67"/>
         <source>Coordinates</source>
         <translation>Koordinaatit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="169"/>
         <source>Divemaster</source>
         <translation>Sukellusvanhin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="154"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Buddy</source>
         <translation>Sukelluspari</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="222"/>
+        <location filename="../qt-ui/maintab.ui" line="277"/>
         <source>Tags</source>
         <translation>Avainsanat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="186"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
         <source>Rating</source>
         <translation>Yleisarvio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="221"/>
         <source>Visibility</source>
         <translation>Näkyvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="230"/>
         <source>Suit</source>
         <translation>Puku</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="465"/>
+        <location filename="../qt-ui/maintab.cpp" line="470"/>
         <source>Dive notes</source>
         <translation>Muistiinpanot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
-        <location filename="../qt-ui/maintab.ui" line="648"/>
-        <location filename="../qt-ui/maintab.cpp" line="277"/>
+        <location filename="../qt-ui/maintab.ui" line="74"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="102"/>
+        <location filename="../qt-ui/maintab.ui" line="677"/>
+        <location filename="../qt-ui/maintab.cpp" line="279"/>
         <source>Air temp.</source>
         <translation>Ilman lämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <location filename="../qt-ui/maintab.ui" line="667"/>
-        <location filename="../qt-ui/maintab.cpp" line="278"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.ui" line="696"/>
+        <location filename="../qt-ui/maintab.cpp" line="280"/>
         <source>Water temp.</source>
         <translation>Veden lämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="229"/>
-        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.ui" line="284"/>
+        <location filename="../qt-ui/maintab.cpp" line="498"/>
         <source>Notes</source>
         <translation>Muistiinpanot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="369"/>
+        <location filename="../qt-ui/maintab.ui" line="398"/>
         <source>Equipment</source>
         <translation>Varusteet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="496"/>
+        <location filename="../qt-ui/maintab.ui" line="525"/>
         <source>Gases used</source>
         <translation>Käytetyt seokset</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="515"/>
+        <location filename="../qt-ui/maintab.ui" line="544"/>
         <source>Gas consumed</source>
         <translation>Kaasun kulutus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="553"/>
+        <location filename="../qt-ui/maintab.ui" line="582"/>
         <source>CNS</source>
         <translation>Happikertymä (CNS)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="591"/>
+        <location filename="../qt-ui/maintab.ui" line="620"/>
         <source>Max. depth</source>
         <translation>Suurin syvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="629"/>
+        <location filename="../qt-ui/maintab.ui" line="658"/>
         <source>Air pressure</source>
         <translation>Ilmanpaine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="686"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>Dive time</source>
         <translation>Sukellusaika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="845"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
         <source>Total time</source>
         <translation>Kokonaisaika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="903"/>
+        <location filename="../qt-ui/maintab.ui" line="932"/>
         <source>Gas consumption</source>
         <translation>Kaasun kulutus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="962"/>
+        <location filename="../qt-ui/maintab.ui" line="991"/>
         <source>Extra data</source>
         <translation>Lisätiedot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="968"/>
+        <location filename="../qt-ui/maintab.ui" line="997"/>
         <source>Additional data from dive computer</source>
         <translation>Lisätiedot sukellustietokoneelta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="54"/>
-        <location filename="../qt-ui/maintab.ui" line="458"/>
+        <location filename="../qt-ui/maintab.ui" line="83"/>
+        <location filename="../qt-ui/maintab.ui" line="487"/>
         <source>Date</source>
         <translation>Ajankohta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="61"/>
+        <location filename="../qt-ui/maintab.ui" line="90"/>
         <source>Time</source>
         <translation>Kello</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="425"/>
+        <location filename="../qt-ui/maintab.ui" line="454"/>
         <source>Dive info</source>
         <translation>Tiedot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="477"/>
+        <location filename="../qt-ui/maintab.ui" line="506"/>
         <source>Interval</source>
         <translation>Pinta-aika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="534"/>
-        <location filename="../qt-ui/maintab.ui" line="799"/>
+        <location filename="../qt-ui/maintab.ui" line="563"/>
+        <location filename="../qt-ui/maintab.ui" line="828"/>
         <source>SAC</source>
         <translation>Pintakulutus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="610"/>
+        <location filename="../qt-ui/maintab.ui" line="639"/>
         <source>Avg. depth</source>
         <translation>Keskisyvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="572"/>
+        <location filename="../qt-ui/maintab.ui" line="601"/>
         <source>OTU</source>
         <translation>Happikertymä (OTU)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="734"/>
         <source>Salinity</source>
         <translation>Suolapitoisuus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="742"/>
+        <location filename="../qt-ui/maintab.ui" line="771"/>
         <source>Stats</source>
         <translation>Tilastot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="775"/>
+        <location filename="../qt-ui/maintab.ui" line="804"/>
         <source>Depth</source>
         <translation>Syvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="787"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Temperature</source>
         <translation>Lämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="813"/>
+        <location filename="../qt-ui/maintab.ui" line="842"/>
         <source>Duration</source>
         <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="864"/>
+        <location filename="../qt-ui/maintab.ui" line="893"/>
         <source>Dives</source>
         <translation>Sukelluksia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="948"/>
+        <location filename="../qt-ui/maintab.ui" line="977"/>
         <source>Photos</source>
         <translation>Valokuvat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="95"/>
+        <location filename="../qt-ui/maintab.cpp" line="87"/>
         <source>Cylinders</source>
         <translation>Säiliöt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="99"/>
+        <location filename="../qt-ui/maintab.cpp" line="91"/>
         <source>Weights</source>
         <translation>Painot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="55"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Apply changes</source>
         <translation>Hyväksy muutokset</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="59"/>
+        <location filename="../qt-ui/maintab.cpp" line="50"/>
         <source>Discard changes</source>
         <translation>Hylkää muutokset</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="96"/>
+        <location filename="../qt-ui/maintab.cpp" line="88"/>
         <source>Add cylinder</source>
         <translation>Lisää säiliö</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="100"/>
+        <location filename="../qt-ui/maintab.cpp" line="92"/>
         <source>Add weight system</source>
         <translation>Lisää painojärjestelmä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="274"/>
+        <location filename="../qt-ui/maintab.cpp" line="276"/>
         <source>Air temp. [%1]</source>
         <translation>Ilman lämpötila [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="275"/>
+        <location filename="../qt-ui/maintab.cpp" line="277"/>
         <source>Water temp. [%1]</source>
         <translation>Veden lämpötila [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="312"/>
+        <location filename="../qt-ui/maintab.cpp" line="314"/>
         <source>This trip is being edited.</source>
         <translation>Tätä sukellusretkeä muokataan.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="320"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Multiple dives are being edited.</source>
         <translation>Muokataan useita sukelluksia.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.cpp" line="324"/>
         <source>This dive is being edited.</source>
         <translation>Tätä sukellusta muokataan.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="436"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
+        <location filename="../qt-ui/maintab.cpp" line="465"/>
         <source>Trip notes</source>
         <translation>Matkan muistiinpanot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="458"/>
+        <location filename="../qt-ui/maintab.cpp" line="463"/>
         <source>Trip location</source>
         <translation>Matkakohde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="526"/>
-        <location filename="../qt-ui/maintab.cpp" line="558"/>
-        <location filename="../qt-ui/maintab.cpp" line="562"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
         <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="574"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="555"/>
+        <location filename="../qt-ui/maintab.cpp" line="563"/>
         <source>Deepest dive</source>
         <translation>Syvin sukellus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="556"/>
+        <location filename="../qt-ui/maintab.cpp" line="564"/>
         <source>Shallowest dive</source>
         <translation>Matalin sukellus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="569"/>
+        <location filename="../qt-ui/maintab.cpp" line="577"/>
         <source>Highest total SAC of a dive</source>
         <translation>Korkein pintakulutus sukelluksella</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="578"/>
         <source>Lowest total SAC of a dive</source>
         <translation>Matalin pintakulutus sukelluksella</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="571"/>
+        <location filename="../qt-ui/maintab.cpp" line="579"/>
         <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="582"/>
+        <location filename="../qt-ui/maintab.cpp" line="590"/>
         <source>Highest temperature</source>
         <translation>Korkein lämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="583"/>
+        <location filename="../qt-ui/maintab.cpp" line="591"/>
         <source>Lowest temperature</source>
         <translation>Matalin lämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="584"/>
+        <location filename="../qt-ui/maintab.cpp" line="592"/>
         <source>Average temperature of all selected dives</source>
         <translation>Valittujen sukellusten keskilämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="594"/>
+        <location filename="../qt-ui/maintab.cpp" line="602"/>
         <source>Longest dive</source>
         <translation>Pisin sukellus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="595"/>
+        <location filename="../qt-ui/maintab.cpp" line="603"/>
         <source>Shortest dive</source>
         <translation>Lyhin sukellus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="596"/>
+        <location filename="../qt-ui/maintab.cpp" line="604"/>
         <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="620"/>
+        <location filename="../qt-ui/maintab.cpp" line="628"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -2863,17 +3060,17 @@ sekoittaa ilmasta ja käyttäen:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="624"/>
+        <location filename="../qt-ui/maintab.cpp" line="632"/>
         <source> and </source>
         <translation>ja</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="911"/>
+        <location filename="../qt-ui/maintab.cpp" line="925"/>
         <source>Discard the changes?</source>
         <translation>Hylätäänkö muutokset?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="912"/>
+        <location filename="../qt-ui/maintab.cpp" line="926"/>
         <source>You are about to discard your changes.</source>
         <translation>Olet hylkäämässä muutoksesi.</translation>
     </message>
@@ -3020,7 +3217,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="296"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="232"/>
         <source>Open</source>
         <translation>Avaa</translation>
     </message>
@@ -3380,90 +3577,90 @@ p, li { white-space: pre-wrap; }
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="252"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="229"/>
         <source>Open file</source>
         <translation>Avaa tiedosto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="256"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="233"/>
         <source>Cancel</source>
         <translation>Peruuta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="332"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="309"/>
         <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="444"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
         <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="491"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
         <source>Print runtime table</source>
         <translation>Tulosta sukellussuunnitelma</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="834"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="811"/>
         <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="836"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="813"/>
         <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="841"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="818"/>
         <source>Save changes?</source>
         <translation>Tallenna muutokset?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1196"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1173"/>
         <source>Save file as</source>
         <translation>Tallenna nimellä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1337"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1314"/>
         <source>Open dive log file</source>
         <translation>Avaa sukellusloki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="819"/>
         <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="300"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="444"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="277"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Warning</source>
         <translation>Varoitus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1180"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1157"/>
         <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="625"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="602"/>
         <source>Yearly statistics</source>
         <translation>Vuositilastot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1197"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1174"/>
         <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="1338"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1315"/>
         <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source>
         <translation>Sukelluslokitiedostot (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran -tiedostot (*.can);;CSV -tiedostot (*.csv);;DiveLog.de -tiedostot (*.dld);;JDiveLog -tiedostot (*.jlb);;Liquivision -tiedostot (*.lvd);;MkVI -tiedostot (*.txt);;Suunto -tiedostot (*.sde *.db);;Divesoft -tiedostot (*.dlf);;UDDF/UDCF -tiedostot (*.uddf *.udcf);;XML -tiedostot (*.xml);;Kaikki tiedostot (*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <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>
@@ -3471,7 +3668,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="651"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="634"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Suodin näyttää %1 (%2:sta) sukelluksesta</translation>
     </message>
@@ -3479,12 +3676,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="239"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation>Sinun tulisi päivittää sukellustietokoneesi ohjelmisto (firmware): käytössä on versio %1, kun viimeisin vakaa versio on %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="243"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
@@ -3493,27 +3690,27 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC Sport -laitteessasi ja tehdä samat toimenpiteet kuin lokikirjan latauksessa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="244"/>
         <source>Not now</source>
         <translation>Ei nyt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="245"/>
         <source>Update firmware</source>
         <translation>Päivitä laiteohjelmisto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
         <source>Firmware upgrade notice</source>
         <translation>Huomautus laiteohjelmiston päivityksessä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
         <source>Save the downloaded firmware as</source>
         <translation>Tallenna ladattu laiteohjelmisto nimellä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
         <source>HEX files (*.hex)</source>
         <translation>HEX -tiedostot (*.hex)</translation>
     </message>
@@ -3521,54 +3718,69 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Open circuit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="481"/>
         <source>Last stop at 20ft</source>
         <translation>Viimeinen pysähdys 20 jalassa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="482"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% keskisyvyydestä - 20 jalkaan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="489"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
         <source>20ft to surface</source>
         <translation>20 jalasta pintaan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="485"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
         <source>Last stop at 6m</source>
         <translation>Viimeinen pysähdys kuudessa metrissä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% keskisyvyydestä - 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="494"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
         <source>6m to surface</source>
         <translation>6m:stä pintaan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="497"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="498"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
         <source>cuft/min</source>
         <translation>ft³/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="506"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="507"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="500"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="501"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
@@ -3687,6 +3899,7 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="816"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -3721,57 +3934,87 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="795"/>
+        <source>CCR: Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="809"/>
+        <source>Default CCR set-point for dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="832"/>
+        <source>pSCR O₂ metabolism rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="839"/>
+        <source>pSCR ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="846"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="859"/>
+        <source>1:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="875"/>
         <source>System default</source>
         <translation>Järjestelmän oletus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="843"/>
+        <location filename="../qt-ui/preferences.ui" line="914"/>
         <source>Proxy</source>
         <translation>Välityspalvelin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="849"/>
+        <location filename="../qt-ui/preferences.ui" line="920"/>
         <source>Proxy type</source>
         <translation>Välityspalvelimen tyyppi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="862"/>
+        <location filename="../qt-ui/preferences.ui" line="933"/>
         <source>Host</source>
         <translation>Osoite</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="888"/>
+        <location filename="../qt-ui/preferences.ui" line="959"/>
         <source>Port</source>
         <translation>Portti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="914"/>
+        <location filename="../qt-ui/preferences.ui" line="985"/>
         <source>Requires authentication</source>
         <translation>Vaatii kirjautumisen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="934"/>
+        <location filename="../qt-ui/preferences.ui" line="1005"/>
         <source>Username</source>
         <translation>Käyttäjätunnus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="957"/>
+        <location filename="../qt-ui/preferences.ui" line="1028"/>
         <source>Password</source>
         <translation>Salasana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="985"/>
-        <source>about:blank</source>
-        <translation>about:blank</translation>
+        <location filename="../qt-ui/preferences.ui" line="1079"/>
+        <source>Disconnect from Facebook</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1011"/>
-        <source>Disconnect from facebook</source>
-        <translation>Katkaise yhteys Facebookiin</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="824"/>
+        <location filename="../qt-ui/preferences.ui" line="895"/>
         <source>Filter</source>
         <translation>Suodattimet</translation>
     </message>
@@ -3926,53 +4169,53 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
         <translation>GFhigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="28"/>
+        <location filename="../qt-ui/preferences.cpp" line="44"/>
         <source>No proxy</source>
         <translation>Ei välityspalvelinta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="29"/>
+        <location filename="../qt-ui/preferences.cpp" line="45"/>
         <source>System proxy</source>
         <translation>Järjestelmän proxy -asetukset</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="30"/>
+        <location filename="../qt-ui/preferences.cpp" line="46"/>
         <source>HTTP proxy</source>
         <translation>HTTP proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="31"/>
+        <location filename="../qt-ui/preferences.cpp" line="47"/>
         <source>SOCKS proxy</source>
         <translation>SOCKS proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="291"/>
+        <location filename="../qt-ui/preferences.cpp" line="324"/>
         <source>Restart required</source>
         <translation>Vaaditaan uudelleenkäynnistys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="292"/>
+        <location filename="../qt-ui/preferences.cpp" line="325"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>Uuden kielen lataaminen vaatii Subsurfacen uudelleenkäynnistyksen
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="456"/>
+        <location filename="../qt-ui/preferences.cpp" line="494"/>
         <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
         <translation>Jos valitset hyväksynnän, kaikki Subsurfacen asetukset palautetaan oletusarvoihin. Muutos tulee käyttöön välittömästi.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurfacen XML tiedostot (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Open default log file</source>
         <translation>Avaa oletustiedosto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="455"/>
+        <location filename="../qt-ui/preferences.cpp" line="493"/>
         <source>Warning</source>
         <translation>Varoitus</translation>
     </message>
@@ -3980,17 +4223,17 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="91"/>
+        <location filename="../qt-ui/printdialog.cpp" line="85"/>
         <source>&amp;Preview</source>
         <translation>Esikatselu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="88"/>
+        <location filename="../qt-ui/printdialog.cpp" line="82"/>
         <source>P&amp;rint</source>
         <translation>Tulosta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="103"/>
+        <location filename="../qt-ui/printdialog.cpp" line="97"/>
         <source>Print</source>
         <translation>Tulosta</translation>
     </message>
@@ -3998,42 +4241,42 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="20"/>
         <source>Dive#</source>
         <translation>Sukellus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="21"/>
         <source>Date</source>
         <translation>Ajankohta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="22"/>
         <source>Depth</source>
         <translation>Syvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="23"/>
         <source>Duration</source>
         <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Master</source>
         <translation>Sukellusvanhin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Buddy</source>
         <translation>Sukelluspari</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="34"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Location</source>
         <translation>Kohde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <location filename="../qt-ui/printlayout.cpp" line="63"/>
         <source>Subsurface cannot find a usable printer on this system!</source>
         <translation>Käyttökelpoista tulostinta ei löydy!</translation>
     </message>
@@ -4099,72 +4342,72 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2095"/>
+        <location filename="../qt-ui/models.cpp" line="2101"/>
         <source>unknown</source>
         <translation>tuntematon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2100"/>
+        <location filename="../qt-ui/models.cpp" line="2106"/>
         <source>Dive #%1 - %2</source>
         <translation>Sukellus #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2103"/>
+        <location filename="../qt-ui/models.cpp" line="2109"/>
         <source>Max depth: %1 %2</source>
         <translation>Suurin syvyys: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2110"/>
+        <location filename="../qt-ui/models.cpp" line="2116"/>
         <source>Duration: %1 min</source>
         <translation>Kesto: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2115"/>
+        <location filename="../qt-ui/models.cpp" line="2121"/>
         <source>Gas used:</source>
         <translation>Kaasun kulutus:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2117"/>
+        <location filename="../qt-ui/models.cpp" line="2123"/>
         <source>Tags:</source>
         <translation>Avainsanat:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2119"/>
+        <location filename="../qt-ui/models.cpp" line="2125"/>
         <source>SAC:</source>
         <translation>Pintakulutus:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2121"/>
+        <location filename="../qt-ui/models.cpp" line="2127"/>
         <source>Weights:</source>
         <translation>Painot:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2126"/>
+        <location filename="../qt-ui/models.cpp" line="2132"/>
         <source>Notes:</source>
         <translation>Muistiinpanot:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2133"/>
+        <location filename="../qt-ui/models.cpp" line="2139"/>
         <source>Divemaster:</source>
         <translation>Sukellusvanhin:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2135"/>
+        <location filename="../qt-ui/models.cpp" line="2141"/>
         <source>Buddy:</source>
         <translation>Sukelluspari:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2137"/>
+        <location filename="../qt-ui/models.cpp" line="2143"/>
         <source>Suit:</source>
         <translation>Puku:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2139"/>
+        <location filename="../qt-ui/models.cpp" line="2145"/>
         <source>Viz:</source>
         <translation>Näkyvyys:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2141"/>
+        <location filename="../qt-ui/models.cpp" line="2147"/>
         <source>Rating:</source>
         <translation>Yleisarvio:</translation>
     </message>
@@ -4172,103 +4415,108 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="628"/>
         <source> (#%1 of %2)</source>
         <translation> (#%1 / %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="630"/>
+        <source>Unknown dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="647"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>Suoranousu-/pintautumisaikaa ei näytetä, koska niiden laskemiseen kuluu liikaa aikaa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1168"/>
         <source>Make first divecomputer</source>
         <translation>Aseta ensisijaiseksi sukellustietokoneeksi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Delete this divecomputer</source>
         <translation>Poista tämä sukellustietokone</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1184"/>
         <source>Add gas change</source>
         <translation>Lisää kaasun vaihto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1187"/>
         <source> (Tank %1)</source>
         <translation>(Säiliö %1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1195"/>
         <source>Add set-point change</source>
         <translation>Aseta setpointin vaihto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1197"/>
         <source>Add bookmark</source>
         <translation>Lisää kirjanmerkki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
         <source>Remove event</source>
         <translation>Poista tapahtuma</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1206"/>
         <source>Hide similar events</source>
         <translation>Piilota samankaltaiset tapahtumat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1213"/>
         <source>Edit name</source>
         <translation>Muokkaa nimeä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1242"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1249"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>Muuta säiliön %1 painetta (tällä hetkellä %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1264"/>
         <source>Unhide all events</source>
         <translation>Näytä kaikki tapahtumat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide events</source>
         <translation>Piilota tapahtumat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide all %1 events?</source>
         <translation>Piilota kaikki %1 tapahtumat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1333"/>
         <source>Remove the selected event?</source>
         <translation>Poistetaanko valitut tapahtumat?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1334"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1424"/>
         <source>Edit name of bookmark</source>
         <translation>Muokkaa kirjanmerkin nimeä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
         <source>Custom name:</source>
         <translation>Valinnainen nimi:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1430"/>
         <source>Name is too long!</source>
         <translation>Nimi on liian pitkä!</translation>
     </message>
@@ -4276,102 +4524,102 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>AIR</source>
         <translation>Ilma</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>OXYGEN</source>
         <translation>HAPPI</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="208"/>
         <source>Remove this point</source>
         <translation>Poista tämä etappi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="57"/>
         <source>Close</source>
         <translation>Sulje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="42"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="25"/>
         <source>Average</source>
         <translation>Keskim.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="45"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="28"/>
         <source>Minimum</source>
         <translation>Alin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="48"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="31"/>
         <source>Maximum</source>
         <translation>Korkein</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="297"/>
+        <location filename="../qt-ui/globe.cpp" line="296"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>Kaksoisnäpäytä karttaa valitaksesi sukelluskohteen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="525"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="526"/>
         <source>lbs</source>
         <translation>pauna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="550"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="551"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="570"/>
+        <location filename="../qt-ui/models.cpp" line="574"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="571"/>
+        <location filename="../qt-ui/models.cpp" line="575"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="595"/>
+        <location filename="../qt-ui/models.cpp" line="599"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="596"/>
+        <location filename="../qt-ui/models.cpp" line="600"/>
         <source>cuft</source>
         <translation>ft³</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="513"/>
         <source>Invalid response from server</source>
         <translation>Virheellinen vastaus palvelimelta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation>Odotettu XML tägi on &apos;DiveDateReader&apos;, mutta saatiin &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="567"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation>Odotettua XML -tägiä &apos;DiveDates&apos; ei löydy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Virheellinen XML vastasu. Rivi %1: %2</translation>
     </message>
@@ -4379,12 +4627,12 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1450"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1518"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Ominaisuus ei ole vielä saatavilla valitulle sukellustietokoneelle.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1442"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Yhteys sukellustietokoneeseen epäonnistui.</translation>
     </message>
@@ -4398,12 +4646,12 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
-        <location filename="../qt-ui/simplewidgets.cpp" line="151"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="134"/>
         <source>New starting number</source>
         <translation>Uusi aloitusnumero</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="149"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="132"/>
         <source>New number</source>
         <translation>Uusi numero</translation>
     </message>
@@ -4411,12 +4659,12 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1575"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1653"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Ominaisuus ei ole vielä saatavilla valitulle sukellustietokoneelle.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1579"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1657"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Yhteys sukellustietokoneeseen epäonnistui.</translation>
     </message>
@@ -4495,12 +4743,12 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
         <translation>Mikä päivä ja aika näkyy kuvassa?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="276"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="259"/>
         <source>Open image file</source>
         <translation>Avaa kuvatiedosto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="278"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="261"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Kuvatiedostot (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -4553,10 +4801,9 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
     <name>SocialNetworkDialog</name>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="282"/>
-        <source>Dive Date: %1 
+        <source>Dive date: %1 
 </source>
-        <translation>Sukelluspäivä: %1
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="285"/>
@@ -4579,10 +4826,9 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="290"/>
-        <source>Dive Location: %1 
+        <source>Dive location: %1 
 </source>
-        <translation>Sukelluskohde: %1
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="293"/>
@@ -4700,47 +4946,47 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="329"/>
         <source>Webservice</source>
         <translation>Verkkopalvelu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="393"/>
         <source>Connecting...</source>
         <translation>Yhdistetään...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
         <source>Download finished</source>
         <translation>Lataus valmistui</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Download error: %1</source>
         <translation>Virhe latauksessa: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="436"/>
         <source>Connection error: </source>
         <translation>Yhteysvirhe:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
         <source>Download successful</source>
         <translation>Lataus onnistui</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="439"/>
         <source>Invalid user identifier!</source>
         <translation>Tuntematon käyttäjä!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="312"/>
         <source>Enter User ID and click Download</source>
         <translation>Syötä käyttäjätunnus ja näpäytä Lataa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="442"/>
         <source>Cannot parse response!</source>
         <translation>Vastauksen jäsentäminen ei onnistu!</translation>
     </message>
@@ -4748,7 +4994,7 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="592"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="575"/>
         <source>Suits: </source>
         <translation>Puvut:</translation>
     </message>
@@ -4756,7 +5002,7 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="119"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="116"/>
         <source>No suit set</source>
         <translation>Pukua ei asetettu</translation>
     </message>
@@ -4773,7 +5019,7 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="513"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="496"/>
         <source>Tags: </source>
         <translation>Avainsanat:</translation>
     </message>
@@ -4781,7 +5027,7 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="144"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="141"/>
         <source>Empty tags</source>
         <translation>Tyhjennä avainsanat</translation>
     </message>
@@ -4789,17 +5035,17 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>Description</source>
         <translation>Kuvaus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -4807,7 +5053,7 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="141"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="131"/>
         <source>Information</source>
         <translation>Tiedot</translation>
     </message>
@@ -4815,7 +5061,7 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1090"/>
+        <location filename="../qt-ui/models.cpp" line="1094"/>
         <source> (%1 shown)</source>
         <translation> (näytetään %1)</translation>
     </message>
@@ -4823,72 +5069,72 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="64"/>
         <source>Check for updates.</source>
         <translation>Tarkista päivitykset.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="66"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Päivitysten tarkistus epäonnistui.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="70"/>
         <source>The following error occurred:</source>
         <translation>Tapahtui seuraava virhe:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="72"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
         <source>Please check your internet connection.</source>
         <translation>Tarkista Internetyhteys.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="85"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="84"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>Käytössä on uusin versio Subsurfacesta.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="88"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>Saatavilla on uusi versio Subsurfacesta.&lt;br/&gt;Näpäytä:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; ladataksesi sen.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="95"/>
         <source>A new version of Subsurface is available.</source>
         <translation>Saatavilla on uusi versio Subsurfacesta.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="97"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
         <source>Latest version is %1, please check with your OS vendor for updates.</source>
         <translation>Uusin versio on %1, tarkista päivityksen saatavuus käyttöjärjestelmäsi valmistajlata.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="103"/>
         <source>Newest release version is </source>
         <translation>Uusin julkaistu versio on</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="105"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
         <source>The server returned the following information:</source>
         <translation>Palvelin palautti seuraavan tiedon:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="121"/>
         <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation>Päivitykset tarkistetaan kahden viikon välein. Voit kieltäytyä, jos et halua automaattista versiopäivitysten tarkastusta.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
         <source>Decline</source>
         <translation>Kieltäydy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="124"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
         <source>Accept</source>
         <translation>Hyväksy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="126"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="125"/>
         <source>Automatic check for updates</source>
         <translation>Päivitysten automaattinen tarkistus</translation>
     </message>
@@ -4896,13 +5142,13 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
 <context>
     <name>UserManual</name>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="55"/>
+        <location filename="../qt-ui/usermanual.cpp" line="54"/>
         <source>User Manual</source>
         <translation>Käyttöohje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="72"/>
-        <location filename="../qt-ui/usermanual.cpp" line="78"/>
+        <location filename="../qt-ui/usermanual.cpp" line="71"/>
+        <location filename="../qt-ui/usermanual.cpp" line="77"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Subsurfacen käyttöohje ei löydy</translation>
     </message>
@@ -4980,84 +5226,84 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
         <translation>Mistä tuot tietoja?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
         <source>
 Operating System: %1</source>
         <translation>
 Käyttöjärjestelmä: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 CPU arkkitehtuuri: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 Language: %1</source>
         <translation>
 Kieli: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="93"/>
         <source>Should we ask you later?</source>
         <translation>Voimmeko esittää kyselyn myöhemmin?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Don&apos;t ask me again</source>
         <translation>Älkää kysykö uudestaan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Ask later</source>
         <translation>Kysy myöhemmin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
         <source>Submit user survey.</source>
         <translation>Lähetä käyttäjäkysely.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask again?</source>
         <translation>Kysytäänkö uudestaan?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="17"/>
         <source>Send</source>
         <translation>Lähetä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>Käyttöjärjestelmän CPU arkkitehtuuri: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation>Kyselyn lähettäminen epäonnistui.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="121"/>
         <source>The following error occurred:</source>
         <translation>Tapahtui seuraava virhe:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>Please check your internet connection.</source>
         <translation>Tarkista Internet -yhteytesi.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="131"/>
         <source>Survey successfully submitted.</source>
         <translation>Kysely on lähetetty onnistuneesti.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="136"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation>Päivitysten tarkastuksssa tapahtui virhe.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -5065,12 +5311,12 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>Description</source>
         <translation>Kuvaus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -5118,12 +5364,12 @@ OS CPU Architecture: %1</source>
         <translation>Lähetä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="247"/>
         <source>Operation timed out</source>
         <translation>Toimenpide ei valmistunut ajoissa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="268"/>
         <source>Transferring data...</source>
         <translation>Tietoa siirretään...</translation>
     </message>
@@ -5131,17 +5377,17 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Type</source>
         <translation>Tyyppi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Weight</source>
         <translation>Painot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="496"/>
+        <location filename="../qt-ui/models.cpp" line="500"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Poista painojärjestelmä.</translation>
     </message>
@@ -5149,19 +5395,19 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1479"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1487"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1497"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1555"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1566"/>
         <source>Failed!</source>
         <translation>Epäonnistui!</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1506"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1576"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Ominaisuus ei ole vielä saatavilla valitulle sukellustietokoneelle.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1580"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Yhteys sukellustietokoneeseen epäonnistui.</translation>
     </message>
@@ -5169,79 +5415,79 @@ OS CPU Architecture: %1</source>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1841"/>
+        <location filename="../qt-ui/models.cpp" line="1847"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Vuosi
 &gt; Kuukausi / Retki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1844"/>
+        <location filename="../qt-ui/models.cpp" line="1850"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1847"/>
+        <location filename="../qt-ui/models.cpp" line="1853"/>
         <source>Duration 
  Total</source>
         <translation>Kesto
 Kokonais</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1850"/>
+        <location filename="../qt-ui/models.cpp" line="1856"/>
         <source>
 Average</source>
         <translation>
 Keskim.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1853"/>
+        <location filename="../qt-ui/models.cpp" line="1859"/>
         <source>
 Shortest</source>
         <translation>
 Lyhin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1856"/>
+        <location filename="../qt-ui/models.cpp" line="1862"/>
         <source>
 Longest</source>
         <translation>
 Pisin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1859"/>
+        <location filename="../qt-ui/models.cpp" line="1865"/>
         <source>Depth (%1)
  Average</source>
         <translation>Dyvyys (%1)
 Keski</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1862"/>
-        <location filename="../qt-ui/models.cpp" line="1871"/>
-        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>
 Minimum</source>
         <translation>
 Alin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1865"/>
-        <location filename="../qt-ui/models.cpp" line="1874"/>
-        <location filename="../qt-ui/models.cpp" line="1883"/>
+        <location filename="../qt-ui/models.cpp" line="1871"/>
+        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>
 Maximum</source>
         <translation>
 Suurin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1874"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Keski</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1883"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Lämpö (%1)
@@ -5322,40 +5568,40 @@ Keski</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1508"/>
+        <location filename="../dive.c" line="1530"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) tai (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="464"/>
+        <location filename="../divelist.c" line="467"/>
         <location filename="../equipment.c" line="81"/>
-        <location filename="../planner.c" line="1060"/>
-        <location filename="../planner.c" line="1063"/>
+        <location filename="../planner.c" line="1081"/>
+        <location filename="../planner.c" line="1084"/>
         <source>air</source>
         <translation>ilma</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="192"/>
+        <location filename="../equipment.c" line="194"/>
         <source>integrated</source>
         <translation>integroitu</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="193"/>
+        <location filename="../equipment.c" line="195"/>
         <source>belt</source>
         <translation>vyöpaino</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="194"/>
+        <location filename="../equipment.c" line="196"/>
         <source>ankle</source>
         <translation>nilkkapaino</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="195"/>
+        <location filename="../equipment.c" line="197"/>
         <source>backplate weight</source>
         <translation>selkäpaino</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="196"/>
+        <location filename="../equipment.c" line="198"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -5363,7 +5609,7 @@ Keski</translation>
         <location filename="../file.c" line="112"/>
         <location filename="../file.c" line="434"/>
         <location filename="../file.c" line="506"/>
-        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="925"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Tiedoston &apos;%s&apos; avaaminen epäonnistui</translation>
     </message>
@@ -5420,9 +5666,9 @@ Keski</translation>
         <translation>Vastaavaa sukellustietokonetta tiedostolle &apos;%s&apos; ei löytynyt</translation>
     </message>
     <message>
-        <location filename="../file.c" line="869"/>
-        <location filename="../file.c" line="909"/>
-        <location filename="../file.c" line="1007"/>
+        <location filename="../file.c" line="870"/>
+        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="1016"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>Maksimimäärä sarakkeita CSV -tuonnissa on %d</translation>
     </message>
@@ -5593,27 +5839,27 @@ Keski</translation>
         <translation>tuntematon tapahtumanumero</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="421"/>
+        <location filename="../libdivecomputer.c" line="419"/>
         <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="427"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Error registering the data</source>
         <translation>Virhe tiedon rekisteröinnissä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="433"/>
         <source>Error parsing the datetime</source>
         <translation>Virhe ajan jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Dive %d: %s</source>
         <translation>Sukellus %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="455"/>
+        <location filename="../libdivecomputer.c" line="454"/>
         <source>Error parsing the divetime</source>
         <translation>Virhe sukelluksen keston jäsentämisessä</translation>
     </message>
@@ -5623,166 +5869,166 @@ Keski</translation>
         <translation>Virhe maksimisyvyyden jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="482"/>
+        <location filename="../libdivecomputer.c" line="483"/>
         <source>Error parsing temperature</source>
         <translation>Virhe lämpötilan jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="501"/>
+        <location filename="../libdivecomputer.c" line="503"/>
         <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="513"/>
+        <location filename="../libdivecomputer.c" line="515"/>
         <source>Error obtaining water salinity</source>
         <translation>Virhe veden suolapitoisuuden määrityksessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="521"/>
+        <location filename="../libdivecomputer.c" line="524"/>
         <source>Error obtaining surface pressure</source>
         <translation>Virhe ilmanpaineen määrityksessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="545"/>
+        <location filename="../libdivecomputer.c" line="549"/>
         <source>Error obtaining divemode</source>
         <translation>Virhe sukellustyypin lataamisessa</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="562"/>
+        <location filename="../libdivecomputer.c" line="569"/>
         <source>Error parsing the gas mix</source>
         <translation>Virhe kaasuseoksen jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="569"/>
+        <location filename="../libdivecomputer.c" line="576"/>
         <source>Error parsing the samples</source>
         <translation>Virhe näytteiden tulkinnassa</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="706"/>
+        <location filename="../libdivecomputer.c" line="713"/>
         <source>Event: waiting for user action</source>
         <translation>Tapahtuma: odotetaan käyttäjän toimia</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="714"/>
+        <location filename="../libdivecomputer.c" line="721"/>
         <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="778"/>
+        <location filename="../libdivecomputer.c" line="785"/>
         <source>Error registering the event handler.</source>
         <translation>Virhe tapahtumakäsittelijän rekisteröinnissä.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="783"/>
+        <location filename="../libdivecomputer.c" line="790"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Virhe perumiskäsittelijän rekisteröinnissä.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="804"/>
+        <location filename="../libdivecomputer.c" line="811"/>
         <source>Dive data import error</source>
         <translation>Virhe sukellusten jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="843"/>
+        <location filename="../libdivecomputer.c" line="850"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>libdivecomputer-kontekstin luominen epäonnistui</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="850"/>
+        <location filename="../libdivecomputer.c" line="857"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Avaaminen epäonnistui: %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="858"/>
+        <location filename="../libdivecomputer.c" line="865"/>
         <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>
     <message>
-        <location filename="../parse-xml.c" line="506"/>
+        <location filename="../parse-xml.c" line="516"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Outo prosenttiosuus: %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1760"/>
+        <location filename="../parse-xml.c" line="1770"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Tiedoston &apos;%s&apos; lukeminen epäonnistui.</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1989"/>
-        <location filename="../parse-xml.c" line="2137"/>
+        <location filename="../parse-xml.c" line="1999"/>
+        <location filename="../parse-xml.c" line="2147"/>
         <source>Database query dm4_events failed.
 </source>
         <translation>Tietokantakysely dm4_events epäonnistui.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1996"/>
-        <location filename="../parse-xml.c" line="2144"/>
+        <location filename="../parse-xml.c" line="2006"/>
+        <location filename="../parse-xml.c" line="2154"/>
         <source>Database query dm4_tags failed.
 </source>
         <translation>Tietokantakysely dm4_tags epäonnistui.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2318"/>
+        <location filename="../parse-xml.c" line="2328"/>
         <source>Database query shearwater_cylinders failed.
 </source>
         <translation>Tietokantakysely shearwater_cylinders epäonnistui.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2325"/>
+        <location filename="../parse-xml.c" line="2335"/>
         <source>Database query shearwater_changes failed.
 </source>
         <translation>Tietokantakysely shearwater_changes epäonnistui.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2332"/>
+        <location filename="../parse-xml.c" line="2342"/>
         <source>Database query shearwater_profile_sample failed.
 </source>
         <translation>Tietokantakysely shearwater_profile_sample epäonnistui.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2451"/>
+        <location filename="../parse-xml.c" line="2461"/>
         <source>Database query cobalt_cylinders failed.
 </source>
         <translation>Tietokantakysely cobalt_cylinders epäonnistui.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2458"/>
+        <location filename="../parse-xml.c" line="2468"/>
         <source>Database query cobalt_buddies failed.
 </source>
         <translation>Tietokantakysely cobalt_buddies epäonnistui.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2465"/>
+        <location filename="../parse-xml.c" line="2475"/>
         <source>Database query cobalt_visibility failed.
 </source>
         <translation>Tietokantakysely cobalt_visibility epäonnistui.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2472"/>
+        <location filename="../parse-xml.c" line="2482"/>
         <source>Database query cobalt_location failed.
 </source>
         <translation>Tietokantakysely cobalt_location epäonnistui.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2479"/>
+        <location filename="../parse-xml.c" line="2489"/>
         <source>Database query cobalt_location (site) failed.
 </source>
         <translation>Tietokantakysely cobalt_location (site) epäonnistui.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2486"/>
+        <location filename="../parse-xml.c" line="2496"/>
         <source>Database query cobalt_profile_sample failed.
 </source>
         <translation>Tietokantakysely cobalt_profile_sample epäonnistui.
@@ -5796,17 +6042,17 @@ Keski</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2168"/>
-        <location filename="../parse-xml.c" line="2189"/>
-        <location filename="../parse-xml.c" line="2508"/>
-        <location filename="../parse-xml.c" line="2527"/>
+        <location filename="../parse-xml.c" line="2178"/>
+        <location filename="../parse-xml.c" line="2199"/>
+        <location filename="../parse-xml.c" line="2518"/>
+        <location filename="../parse-xml.c" line="2537"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Tietokantakysely epäonnistui &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2848"/>
+        <location filename="../parse-xml.c" line="2909"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Tyylitiedoston %1 avaus ei onnistu</translation>
     </message>
@@ -5816,163 +6062,169 @@ Keski</translation>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="820"/>
+        <location filename="../planner.c" line="841"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Seosta %s ei löydy</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="356"/>
+        <location filename="../planner.c" line="363"/>
         <source>Too many gas mixes</source>
         <translation>Liian monta kaasuseosta</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="540"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation>Dekon laskeminen on keskeytetty kohtuuttoman keston vuoksi</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="548"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation>perustuu arvoihin GFlow = %d ja GFhigh = %d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="544"/>
+        <location filename="../planner.c" line="551"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurfacen sukellussuunnitelma</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="548"/>
+        <location filename="../planner.c" line="555"/>
         <source>depth</source>
         <translation>syvyys</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="558"/>
         <source>runtime</source>
         <translation>sukellusaika</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="554"/>
+        <location filename="../planner.c" line="561"/>
         <source>duration</source>
         <translation>kesto</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="557"/>
+        <location filename="../planner.c" line="564"/>
         <source>gas</source>
         <translation>kaasu</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="594"/>
+        <location filename="../planner.c" line="601"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Siirtymä %.*f %s ajassa %d:%02d min - aika %d:%02u seoksella %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="602"/>
+        <location filename="../planner.c" line="609"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Siirtymä %.*f %s ajassa %d:%02d min - sukellusaika %d:%02u on %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="615"/>
+        <location filename="../planner.c" line="622"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Pysy syvyydessä %.*f %s %d:%02d min - aika %d:%02u seoksella %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="622"/>
+        <location filename="../planner.c" line="629"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Pysy %.*f %s:n syvyydessä %d:%02d min - sukellusaika %d:%02u %s:lla</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="635"/>
+        <location filename="../planner.c" line="642"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="638"/>
-        <location filename="../planner.c" line="642"/>
+        <location filename="../planner.c" line="645"/>
+        <location filename="../planner.c" line="649"/>
         <source>%3dmin</source>
         <translation>%3d min</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="651"/>
+        <location filename="../planner.c" line="658"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="676"/>
+        <location filename="../planner.c" line="683"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Vaihda kaasu seuraavaan %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="678"/>
+        <location filename="../planner.c" line="685"/>
         <source>Switch gas to %s</source>
         <translation>Vaihda kaasu seuraavaan: %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="697"/>
+        <location filename="../planner.c" line="704"/>
         <source>CNS</source>
         <translation>Happikertymä (CNS)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="699"/>
+        <location filename="../planner.c" line="706"/>
         <source>OTU</source>
         <translation>Happikertymä (OTU)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="710"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Kaasun kulutus (CCR -etappeja ei mukana):</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="705"/>
+        <location filename="../planner.c" line="712"/>
         <source>Gas consumption:</source>
         <translation>Kaasun kulutus:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="535"/>
-        <location filename="../planner.c" line="725"/>
-        <location filename="../planner.c" line="730"/>
-        <location filename="../planner.c" line="753"/>
+        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="732"/>
+        <location filename="../planner.c" line="737"/>
+        <location filename="../planner.c" line="762"/>
+        <location filename="../planner.c" line="772"/>
         <source>Warning:</source>
         <translation>Varoitus:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="523"/>
+        <location filename="../planner.c" line="530"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
         <translation>VAROITUS: BUHLMANNIN ALGORITMIN TOTEUTUS JA SIIHEN PERUSTUVA SUKELLUSTEN SUUNNITTELUOMINAISUUS OVAT UUSIA, JOTEN NIITÄ ON TESTATTU VAIN RAJALLISESTI. SUKELLUKSIA SUUNNITELTAESSA EI TULE LUOTTAA VAIN NÄIHIN TULOKSIIN.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="726"/>
+        <location filename="../planner.c" line="733"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>tämä on enemmän kaasua kuin sinulla on määritellyissä säiliöissä!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="731"/>
+        <location filename="../planner.c" line="738"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>sinulla ei ole tarpeeksi kaasua jakaaksesi sitä pintaan nousun ajan!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="733"/>
+        <location filename="../planner.c" line="740"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s / %s (%.0f%s/%.0f%s suunnitellussa nousussa)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="735"/>
+        <location filename="../planner.c" line="742"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s suunnitellun nousun aikana) / %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="759"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>korkea pO₂ -arvo %.2f %d:%02u:ssa seoksella %s syvyydessä %.*f %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="1064"/>
+        <location filename="../planner.c" line="769"/>
+        <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="1085"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1099"/>
+        <location filename="../profile.c" line="1113"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -5981,70 +6233,70 @@ S: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1102"/>
+        <location filename="../profile.c" line="1116"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1106"/>
+        <location filename="../profile.c" line="1120"/>
         <source>T: %.1f%s
 </source>
         <translation>L: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1112"/>
+        <location filename="../profile.c" line="1126"/>
         <source>V: %.1f%s
 </source>
         <translation>N: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1115"/>
+        <location filename="../profile.c" line="1129"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1117"/>
+        <location filename="../profile.c" line="1131"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1119"/>
+        <location filename="../profile.c" line="1133"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1121"/>
+        <location filename="../profile.c" line="1135"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1123"/>
+        <location filename="../profile.c" line="1137"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1140"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1147"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -6053,7 +6305,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1137"/>
+        <location filename="../profile.c" line="1151"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -6062,148 +6314,148 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1149"/>
+        <location filename="../profile.c" line="1163"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Turvapysähdys: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1152"/>
+        <location filename="../profile.c" line="1166"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Turvapysähdys: ajankohta? @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1157"/>
+        <location filename="../profile.c" line="1171"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1174"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deko: ajankohta? @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1178"/>
         <source>In deco
 </source>
         <translation>Dekossa</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1166"/>
+        <location filename="../profile.c" line="1180"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1183"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1172"/>
+        <location filename="../profile.c" line="1186"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (lask.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1180"/>
+        <location filename="../profile.c" line="1194"/>
         <source>In deco (calc)
 </source>
         <translation>Dekossa (lask.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1196"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1185"/>
+        <location filename="../profile.c" line="1199"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1188"/>
+        <location filename="../profile.c" line="1202"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Laskettu katto %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1194"/>
+        <location filename="../profile.c" line="1208"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Kudos %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1214"/>
         <source>heartbeat: %d
 </source>
         <translation>syke: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1202"/>
+        <location filename="../profile.c" line="1216"/>
         <source>bearing: %d
 </source>
         <translation>suunta: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1205"/>
+        <location filename="../profile.c" line="1219"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>Keskisyvyys tähän asti %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1314"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sA: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1304"/>
-        <location filename="../profile.c" line="1308"/>
-        <location filename="../profile.c" line="1312"/>
+        <location filename="../profile.c" line="1318"/>
+        <location filename="../profile.c" line="1322"/>
+        <location filename="../profile.c" line="1326"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sS:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1316"/>
+        <location filename="../profile.c" line="1330"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sS:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1334"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sN:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1324"/>
-        <location filename="../profile.c" line="1328"/>
+        <location filename="../profile.c" line="1338"/>
+        <location filename="../profile.c" line="1342"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sN:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1335"/>
+        <location filename="../profile.c" line="1349"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -6334,6 +6586,7 @@ EADD: %d%s
     </message>
     <message>
         <location filename="../dive.c" line="30"/>
+        <location filename="../equipment.c" line="85"/>
         <source>oxygen</source>
         <translation>happi</translation>
     </message>
@@ -6388,97 +6641,97 @@ EADD: %d%s
         <translation>(ei sukelluksia)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sun</source>
         <translation>su</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Mon</source>
         <translation>ma</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Tue</source>
         <translation>ti</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Wed</source>
         <translation>ke</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Thu</source>
         <translation>to</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Fri</source>
         <translation>pe</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sat</source>
         <translation>la</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jan</source>
         <translation>tammi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Feb</source>
         <translation>helmi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Mar</source>
         <translation>maalis</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Apr</source>
         <translation>huhti</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>May</source>
         <translation>touko</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jun</source>
         <translation>kesä</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Jul</source>
         <translation>heinä</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Aug</source>
         <translation>elo</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Sep</source>
         <translation>syys</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Oct</source>
         <translation>loka</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Nov</source>
         <translation>marras</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Dec</source>
         <translation>joulu</translation>
     </message>
@@ -7082,13 +7335,13 @@ Onko Uemis Zurich kytketty oikein?</translation>
         <translation>Suunnittelu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
         <source>GF low</source>
         <translation>GF matala</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>%</source>
         <translation>%</translation>
     </message>
@@ -7098,7 +7351,7 @@ Onko Uemis Zurich kytketty oikein?</translation>
         <translation>GF korkea</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="335"/>
         <source>Drop to first depth</source>
         <translation>Putoaminen alkusyvyyteen</translation>
     </message>
@@ -7108,69 +7361,69 @@ Onko Uemis Zurich kytketty oikein?</translation>
         <translation>Viimeinen pysähdys kuudessa metrissä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
         <source>Plan backgas breaks</source>
         <translation>Suunnittele ilmatauot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="355"/>
         <source>Gas options</source>
         <translation>Kaasuasetukset</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="376"/>
         <source>Bottom SAC</source>
         <translation>Ilmankulutus pohjalla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="383"/>
         <source>Deco SAC</source>
         <translation>Ilmankulutus (deko)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="380"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="390"/>
         <source>Bottom pO₂</source>
         <translation>pO₂ pohjalla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="403"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="413"/>
         <source>Deco pO₂</source>
         <translation>pO₂ dekossa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="449"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="462"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="478"/>
         <source>Dive notes</source>
         <translation>Muistiinpanot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
         <source>Display runtime</source>
         <translation>Näytä sukellusaika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <source>Display segment duration</source>
         <translation>Näytä etappien kestot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="531"/>
         <source>Display transitions in deco</source>
         <translation>Näytä siirtymät dekossa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="538"/>
         <source>Verbatim dive plan</source>
         <translation>Tarkka sukellussuunnitelma</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="387"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="410"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="397"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -7190,17 +7443,17 @@ Onko Uemis Zurich kytketty oikein?</translation>
         <translation>6m:stä pintaan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="499"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>Sukelluksen suunnittelu: näytä kokonaiskesto (absoluuttinen aika)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="515"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>Sukelluksen suunnittelu: näytä pysähdysten kesto (suhteellinen aika)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>Listataanko siirtymät erikseen sukellussuunnitelmassa?</translation>
     </message>
diff --git a/translations/subsurface_fr_FR.ts b/translations/subsurface_fr_FR.ts
index ae9758d44..2c93ab2ba 100644
--- a/translations/subsurface_fr_FR.ts
+++ b/translations/subsurface_fr_FR.ts
@@ -3,12 +3,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="539"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="522"/>
         <source>Person: </source>
         <translation>Personne : </translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="540"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="523"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Recherches d&apos;équipiers et de moniteurs</translation>
     </message>
@@ -16,40 +16,188 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="233"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="230"/>
         <source>No buddies</source>
         <translation>Pas d&apos;équiper</translation>
     </message>
 </context>
 <context>
+    <name>ColumnNameProvider</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>GPS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Avg depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="210"/>
+        <location filename="../configuredivecomputer.cpp" line="212"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation>Impossible de sauvegarder le fichier de sauvegarde %1. Message d&apos;erreur : %2</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="226"/>
+        <location filename="../configuredivecomputer.cpp" line="228"/>
         <source>Could not open backup file: %1</source>
         <translation>Impossible d&apos;ouvrir le fichier de sauvegarde : %1</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="542"/>
+        <location filename="../configuredivecomputer.cpp" line="552"/>
         <source>Dive computer details read successfully</source>
         <translation>Succès de la lecture des détail de l&apos;ordinateur de plongée</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="551"/>
+        <location filename="../configuredivecomputer.cpp" line="561"/>
         <source>Setting successfully written to device</source>
         <translation>Paramètre correctement envoyé à l&apos;ordinateur</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="560"/>
+        <location filename="../configuredivecomputer.cpp" line="570"/>
         <source>Device firmware successfully updated</source>
         <translation>Le firmware de l&apos;ordinateur a été mis à jour avec succès</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="569"/>
+        <location filename="../configuredivecomputer.cpp" line="579"/>
         <source>Device settings successfully reset</source>
         <translation>Les paramètres de l&apos;ordinateur ont été remis à zéro avec succès</translation>
     </message>
@@ -847,72 +995,72 @@
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1053"/>
         <source>Backup files (*.xml)</source>
         <translation>Sauvegarder les fichiers (*.xml)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1037"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>Une erreur s&apos;est produite lors de l&apos;enregistrement du fichier de sauvegarde.
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1040"/>
         <source>Backup succeeded</source>
         <translation>Sauvegarde réussie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1041"/>
         <source>Your settings have been saved to: %1</source>
         <translation>Vos paramètres ont été enregistrés vers : %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1030"/>
         <source>Backup dive computer settings</source>
         <translation>Sauvegarder les paramètres de l&apos;ordinateur de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1036"/>
         <source>XML backup error</source>
         <translation>Erreur de sauvegarde XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1052"/>
         <source>Restore dive computer settings</source>
         <translation>Restaurer les paramètres de l&apos;ordinateur de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1056"/>
         <source>XML restore error</source>
         <translation>Erreur de restauration XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1057"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>Une erreur s&apos;est produite lors de la restauration du fichier de sauvegarde.
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1063"/>
         <source>Restore succeeded</source>
         <translation>La restauration s&apos;est effectuée avec succès</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1064"/>
         <source>Your settings have been restored successfully.</source>
         <translation>Vos paramètres ont été restaurés avec succès.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1074"/>
         <source>Select firmware file</source>
         <translation>Sélectionner le fichier de firmware</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1075"/>
         <source>All files (*.*)</source>
         <translation>Tous les fichiers (*.*)</translation>
     </message>
@@ -970,12 +1118,12 @@
         <translation>Cliquer ici retirera ce bloc.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="410"/>
         <source>Cylinder cannot be removed</source>
         <translation>Le bloc ne peut pas être retiré.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="407"/>
+        <location filename="../qt-ui/models.cpp" line="411"/>
         <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>
@@ -1051,12 +1199,12 @@
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="48"/>
         <source>Remove the selected dive computer?</source>
         <translation>Retirer l&apos;ordinateur de plongée sélectionné ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="49"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
         <translation>Êtes-vous sûr de vouloir retirer 
@@ -1071,22 +1219,22 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Model</source>
         <translation>Modèle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Device ID</source>
         <translation>ID du périphérique</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Nickname</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Cliquer ici retirera cet ordinateur</translation>
     </message>
@@ -1094,117 +1242,145 @@
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="115"/>
         <source>Bailing out to OC</source>
         <translation>Passer en CO</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="117"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> début</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> fin</translation>
     </message>
 </context>
 <context>
+    <name>DiveImportedModel</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="556"/>
+        <source>Date/time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
+        <source>Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>h:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>min</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1242"/>
+        <location filename="../qt-ui/models.cpp" line="1248"/>
         <source>#</source>
         <translation>N°</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1245"/>
+        <location filename="../qt-ui/models.cpp" line="1251"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1248"/>
+        <location filename="../qt-ui/models.cpp" line="1254"/>
         <source>Rating</source>
         <translation>Évaluation</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Depth(%1)</source>
         <translation>Profondeur(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>ft</source>
         <translation>pied</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1254"/>
+        <location filename="../qt-ui/models.cpp" line="1260"/>
         <source>Duration</source>
         <translation>Durée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1263"/>
         <source>Temp(%1%2)</source>
         <translation>Température(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>Weight(%1)</source>
         <translation>Poids(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>lbs</source>
         <translation>livre US</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1263"/>
+        <location filename="../qt-ui/models.cpp" line="1269"/>
         <source>Suit</source>
         <translation>Combinaison</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1266"/>
+        <location filename="../qt-ui/models.cpp" line="1272"/>
         <source>Cyl</source>
         <translation>Bloc</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1269"/>
+        <location filename="../qt-ui/models.cpp" line="1275"/>
         <source>Gas</source>
         <translation>Gaz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>SAC(%1)</source>
         <translation>Consommation d&apos;air(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1277"/>
+        <location filename="../qt-ui/models.cpp" line="1283"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1280"/>
+        <location filename="../qt-ui/models.cpp" line="1286"/>
         <source>Max CNS</source>
         <translation>SNC max</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1283"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>Location</source>
         <translation>Lieu</translation>
     </message>
@@ -1212,87 +1388,87 @@
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="787"/>
+        <location filename="../qt-ui/divelistview.cpp" line="768"/>
         <source>Expand all</source>
         <translation>Tout déplier</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="788"/>
+        <location filename="../qt-ui/divelistview.cpp" line="769"/>
         <source>Collapse all</source>
         <translation>Tout replier</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="789"/>
+        <location filename="../qt-ui/divelistview.cpp" line="770"/>
         <source>Collapse others</source>
         <translation>Replier les autres</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="791"/>
+        <location filename="../qt-ui/divelistview.cpp" line="772"/>
         <source>Remove dive(s) from trip</source>
         <translation>Supprimer la (les) plongée(s) du voyage</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="792"/>
+        <location filename="../qt-ui/divelistview.cpp" line="773"/>
         <source>Create new trip above</source>
         <translation>Créer un nouveau voyage au-dessus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="806"/>
+        <location filename="../qt-ui/divelistview.cpp" line="787"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Ajouter la(les) plongée(s) au voyage immédiatement au dessus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="808"/>
+        <location filename="../qt-ui/divelistview.cpp" line="789"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Ajouter la (les) plongée(s) au voyage immédiatement ci-dessous</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="812"/>
+        <location filename="../qt-ui/divelistview.cpp" line="793"/>
         <source>Merge trip with trip above</source>
         <translation>Fusionner le voyage avec le voyage du dessus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="813"/>
+        <location filename="../qt-ui/divelistview.cpp" line="794"/>
         <source>Merge trip with trip below</source>
         <translation>Fusionner le groupe avec le voyage du dessous</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="817"/>
+        <location filename="../qt-ui/divelistview.cpp" line="798"/>
         <source>Delete dive(s)</source>
         <translation>Effacer la (les) plongée(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="819"/>
+        <location filename="../qt-ui/divelistview.cpp" line="800"/>
         <source>Mark dive(s) invalid</source>
         <translation>Marquer la (les) plongée(s) comme invalides</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="823"/>
+        <location filename="../qt-ui/divelistview.cpp" line="804"/>
         <source>Merge selected dives</source>
         <translation>Fusionner les plongées sélectionnées</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="825"/>
+        <location filename="../qt-ui/divelistview.cpp" line="806"/>
         <source>Renumber dive(s)</source>
         <translation>Renuméroter la (les) plongée(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="826"/>
+        <location filename="../qt-ui/divelistview.cpp" line="807"/>
         <source>Shift times</source>
         <translation>Décaler l&apos;heure</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="827"/>
+        <location filename="../qt-ui/divelistview.cpp" line="808"/>
         <source>Load images</source>
         <translation>Charger les images</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Open image files</source>
         <translation>Ouvrir les fichiers images</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Fichier image (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -1478,100 +1654,100 @@
         <translation>Sable</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>Fichiers UDDF (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="268"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>Fichiers CSV (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="68"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Format générique utilisé pour l&apos;échange de données entre plusieurs logiciels de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>Valeurs séparées par des virgules décrivant le profil de plongée.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation>Valeurs séparées par des virgules pour les informations de plongée. Cela inclut la plupart des détails de plongée mais aucune information de profil.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Envoyer les données de la plongée au site divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>Envoyer les informations des plongées au site dive-share.appspot.com</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>Export HTML des lieux de plongées, indiqués sur une carte du monde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
         <source>Subsurface native XML format.</source>
         <translation>Format XML natif de Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
         <source>Write depths of images to file.</source>
         <translation>Sauvegarder les profondeurs des images dans le fichier.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export UDDF file as</source>
         <translation>Exporter le fichier UDDF en</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="267"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
         <source>Export CSV file as</source>
         <translation>Exporter le fichier CSV en</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="278"/>
         <source>Export world map</source>
         <translation>Exporter la carte mondiale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="299"/>
         <source>HTML files (*.html)</source>
         <translation>Fichiers HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="283"/>
         <source>Export Subsurface XML</source>
         <translation>Exporter vers fichier XML Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="284"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>Fichiers XML (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
         <source>Save image depths</source>
         <translation>Sauvegarder la profondeur de l&apos;image</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="298"/>
         <source>Export HTML files as</source>
         <translation>Exporter le fichier HTML comme</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
         <source>Can&apos;t open file %s</source>
         <translation>Impossible d&apos;ouvrir le fichier %s</translation>
     </message>
@@ -1584,248 +1760,228 @@
         <translation>Importer des plongées depuis un fichier</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
-        <source>CSV options</source>
-        <translation>Options CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="281"/>
-        <source>Pre-configured imports</source>
-        <translation>Importations pré-configurées</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="122"/>
-        <source>Depth</source>
-        <translation>Profondeur</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="142"/>
-        <source>Stopdepth</source>
-        <translation>Profondeur d’arrêt</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="162"/>
-        <source>Pressure</source>
-        <translation>Pression</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="176"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="466"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
         <source>Time</source>
         <translation>Heure</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="183"/>
-        <source>Temp</source>
-        <translation>Temp</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="213"/>
-        <source>NDL</source>
-        <translation>LND</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="233"/>
-        <source>TTS</source>
-        <translation>DTR</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="253"/>
-        <source>Cns</source>
-        <translation>SNC</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="58"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="789"/>
-        <source>Field separator</source>
-        <translation>Séparateur de champs</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="35"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="363"/>
-        <source>Units</source>
-        <translation>Unités</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="42"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="370"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="97"/>
         <source>Metric</source>
         <translation>Métrique</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="47"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="375"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="102"/>
         <source>Imperial</source>
         <translation>Impérial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="169"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="298"/>
-        <source>Manual dives</source>
-        <translation>Plongées manuelle</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="316"/>
-        <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source>
-        <translation>Choisissez l&apos;ordre des jours, mois et années pour le format de la date. Le séparateur de champ peut être un des caractères suivant .-/.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="319"/>
-        <source>Date format</source>
-        <translation>Format de date</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="332"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="59"/>
         <source>dd.mm.yyyy</source>
         <translation>jj.mm.aaaa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="337"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="64"/>
         <source>mm/dd/yyyy</source>
         <translation>mm/jj/aaaa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="342"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="69"/>
         <source>yyyy-mm-dd</source>
         <translation>aaaa-mm-jj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="392"/>
-        <source>Dive #</source>
-        <translation>Plongée n°</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="426"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="439"/>
-        <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source>
-        <translation>Date au format jj.mm.aaaa, aaaa-mm-jj ou mm/jj/aaaa</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+        <source>Dive #</source>
+        <translation>Plongée n°</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="429"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="500"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="513"/>
-        <source>Dive duration in seconds or in min:sec format</source>
-        <translation>Durée de plongée en secondes ou en min:sec</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="503"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
         <source>Duration</source>
         <translation>Durée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="574"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="591"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
         <source>Tags</source>
         <translation>Étiquettes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="608"/>
-        <source>Cyl size</source>
-        <translation>Taille de bloc</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="625"/>
-        <source>Air temp</source>
-        <translation>Temp. air</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="642"/>
-        <source>Start Pressure</source>
-        <translation>Pression initiale</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="659"/>
-        <source>Water temp</source>
-        <translation>Temp. eau</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="676"/>
-        <source>End Press</source>
-        <translation>Pression finale</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="693"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
         <source>O₂</source>
         <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="710"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
         <source>He</source>
         <translation>He</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="742"/>
-        <source>Choose duration format.</source>
-        <translation>Choisir le format de durée.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="745"/>
-        <source>Duration format</source>
-        <translation>Format de durée</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="758"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="78"/>
         <source>Seconds</source>
         <translation>Secondes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="763"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
         <source>Minutes</source>
         <translation>Minutes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="768"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="88"/>
         <source>Minutes:seconds</source>
         <translation>Minutes:secondes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="540"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
         <source>Location</source>
         <translation>Lieu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="409"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
         <source>Max depth</source>
         <translation>Profondeur max.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="386"/>
-        <source>Field configuration</source>
-        <translation>Configuration des champs</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+        <source>Tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+        <source>Samples pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
         <source>Mean depth</source>
         <translation>Prof. moyenne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="483"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
         <source>Buddy</source>
         <translation>Équipier</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="523"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
         <source>Notes</source>
         <translation>Notes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="557"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
         <source>Weight</source>
         <translation>Poids</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DivePlanner</name>
@@ -1868,42 +2024,42 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
         <source>unknown</source>
         <translation>inconnu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="691"/>
         <source>Final depth</source>
         <translation>Prof. finale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="693"/>
         <source>Run time</source>
         <translation>Durée de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="701"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="695"/>
         <source>Duration</source>
         <translation>Durée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="703"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
         <source>Used gas</source>
         <translation>Gaz utilisé</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="705"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
         <source>CC set point</source>
         <translation>CC (recycleur) Set Point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1044"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1051"/>
         <source>Discard the plan?</source>
         <translation>Abandonner le plan ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1045"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1052"/>
         <source>You are about to discard your plan.</source>
         <translation>Vous êtes sur le point d&apos;annuler la planification.</translation>
     </message>
@@ -1911,22 +2067,22 @@
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="257"/>
         <source>Dive planner points</source>
         <translation>Points du plannificateur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="261"/>
         <source>Available gases</source>
         <translation>Gaz disponibles</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="284"/>
         <source>Add dive data point</source>
         <translation>Ajouter un point de donnée de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="304"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="293"/>
         <source>Save new</source>
         <translation>Enregistrer sous</translation>
     </message>
@@ -1934,92 +2090,112 @@
 <context>
     <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Depth</source>
         <translation>Profondeur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
         <source>Time</source>
         <translation>Heure</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
         <source>Pressure</source>
         <translation>Pression</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>Temperature</source>
         <translation>Température</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
         <source>Color</source>
         <translation>Couleur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
         <source>Pressure S</source>
         <translation>Pression S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
+        <source>Setpoint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
+        <source>Sensor1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
+        <source>Sensor2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
+        <source>Sensor3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
         <source>Ambient pressure</source>
         <translation>Pression ambiante</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
-        <source>Heart Beat</source>
-        <translation>Fréquence cardiaque</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
+        <source>Heart beat</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
-        <source>Gradient Factor</source>
-        <translation>Facteur de gradient</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/>
+        <source>Gradient factor</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
-        <source>Mean Depth/s</source>
-        <translation>Profondeur moyenne</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
+        <source>Mean depth/s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
         <source>Pressure I</source>
         <translation>Pression I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
         <source>User entered</source>
         <translation>Entré par l&apos;utilisateur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
         <source>Cylinder index</source>
         <translation>Index du bloc</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
         <source>Ceiling</source>
         <translation>Plafond</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
         <source>SAC</source>
         <translation>Consommation d&apos;air</translation>
     </message>
@@ -2070,127 +2246,127 @@
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1437"/>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1443"/>
+        <location filename="../qt-ui/models.cpp" line="1489"/>
         <source>#</source>
         <translation>N°</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1440"/>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1492"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1443"/>
-        <location filename="../qt-ui/models.cpp" line="1489"/>
+        <location filename="../qt-ui/models.cpp" line="1449"/>
+        <location filename="../qt-ui/models.cpp" line="1495"/>
         <source>Rating</source>
         <translation>Évaluation</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1452"/>
         <source>Depth</source>
         <translation>Profondeur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1458"/>
         <source>Temp</source>
         <translation>Temp.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1461"/>
         <source>Weight</source>
         <translation>Poids</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>SAC</source>
         <translation>Consommation d&apos;air</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>ft</source>
         <translation>pied</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>Weight(%1)</source>
         <translation>Poids(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1458"/>
-        <location filename="../qt-ui/models.cpp" line="1504"/>
+        <location filename="../qt-ui/models.cpp" line="1464"/>
+        <location filename="../qt-ui/models.cpp" line="1510"/>
         <source>Suit</source>
         <translation>Combinaison</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1461"/>
-        <location filename="../qt-ui/models.cpp" line="1507"/>
+        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1513"/>
         <source>Cyl</source>
         <translation>Bloc</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1464"/>
-        <location filename="../qt-ui/models.cpp" line="1510"/>
+        <location filename="../qt-ui/models.cpp" line="1470"/>
+        <location filename="../qt-ui/models.cpp" line="1516"/>
         <source>Gas</source>
         <translation>Gaz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>SAC(%1)</source>
         <translation>Consommation d&apos;air(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1473"/>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1527"/>
         <source>Max CNS</source>
         <translation>SNC max</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
-        <location filename="../qt-ui/models.cpp" line="1524"/>
+        <location filename="../qt-ui/models.cpp" line="1482"/>
+        <location filename="../qt-ui/models.cpp" line="1530"/>
         <source>Location</source>
         <translation>Lieu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>Depth(%1)</source>
         <translation>Profondeur(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1449"/>
-        <location filename="../qt-ui/models.cpp" line="1495"/>
+        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1501"/>
         <source>Duration</source>
         <translation>Durée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1498"/>
+        <location filename="../qt-ui/models.cpp" line="1504"/>
         <source>Temp(%1%2)</source>
         <translation>Température(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>lbs</source>
         <translation>livre US</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1470"/>
-        <location filename="../qt-ui/models.cpp" line="1518"/>
+        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1524"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -2198,95 +2374,95 @@
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="98"/>
         <source>no dives were selected</source>
         <translation>Aucune plongée sélectionnée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="117"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>Erreur de création du fichier zip pour envoi : %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="143"/>
         <source>cannot create temporary file: %s</source>
         <translation>Impossible de créer le fichier temporaire : %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/>
         <source>internal error: %s</source>
         <translation>Erreur interne : %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="169"/>
         <source>internal error</source>
         <translation>Erreur interne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="629"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="828"/>
         <source>Done</source>
         <translation>Terminé</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/>
         <source>Uploading dive list...</source>
         <translation>Envoi de la liste des plongées</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="692"/>
         <source>Downloading dive list...</source>
         <translation>Téléchargement de la liste des plongées...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="741"/>
         <source>Downloading %1 dives...</source>
         <translation>Téléchargement de %1 plongées...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="785"/>
         <source>Download finished - %1</source>
         <translation>Téléchargement terminé - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="802"/>
         <source>Corrupted download</source>
         <translation>Téléchargement corrompu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>L&apos;archive ne peut pas être ouverte :
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
         <source>Upload failed</source>
         <translation>Échec de l&apos;envoi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/>
         <source>Upload successful</source>
         <translation>Envoi terminé avec succès</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
         <source>Login failed</source>
         <translation>Échec de connexion</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
         <source>Cannot parse response</source>
         <translation>Impossible d&apos;analyser la réponse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
         <source>Error: %1</source>
         <translation>Erreur : %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="829"/>
         <source>Upload finished</source>
         <translation>Envoi terminé</translation>
     </message>
@@ -2294,54 +2470,52 @@
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="169"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="400"/>
         <source>Retry</source>
         <translation>Essayer à nouveau</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="264"/>
         <source>Find Uemis dive computer</source>
         <translation>Trouver l&apos;ordinateur de plongée Uemis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Choisir le fichier pour le téléchargement du fichier log de l&apos;ordinateur de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Log files (*.log)</source>
         <translation>Fichier de log (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="362"/>
         <source>Warning</source>
         <translation>Avertissement</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="363"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>Sauvegarder les données brutes de libdivecomputer NE téléchargera PAS les plongées dans la liste des plongées.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="374"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Choisir le fichier pour les données brutes binaires de libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="375"/>
         <source>Dump files (*.bin)</source>
         <translation>Fichiers de données brutes (*.bin)</translation>
     </message>
@@ -2349,7 +2523,7 @@
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="101"/>
         <source>Vendor</source>
         <translation>Fabricant</translation>
     </message>
@@ -2359,54 +2533,74 @@
         <translation>Télécharger depuis l&apos;ordinateur de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="31"/>
         <source>Device or mount point</source>
         <translation>Périphérique ou point de montage</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="111"/>
         <source>Dive computer</source>
         <translation>Ordinateur de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="132"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="45"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="80"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="94"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="52"/>
         <source>Force download of all dives</source>
         <translation>Forcer le téléchargement de toutes les plongées</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
         <source>Always prefer downloaded dives</source>
         <translation>Toujours préférer les plongées téléchargées</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="189"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/>
+        <source>Downloaded Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
+        <source>Select all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
+        <source>Unselect all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
         <source>Save libdivecomputer logfile</source>
         <translation>Sauvegarder le fichier log de libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="87"/>
         <source>Save libdivecomputer dumpfile</source>
         <translation>Sauvegarder le fichier de données brutes de libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
         <source>Download into new trip</source>
         <translation>Télécharger dans un nouveau voyage</translation>
     </message>
@@ -2414,12 +2608,12 @@
 <context>
     <name>ExtraDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Key</source>
         <translation>Clé</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Value</source>
         <translation>Valeur</translation>
     </message>
@@ -2433,21 +2627,20 @@
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="245"/>
-        <source>Your dive profile was updated to facebook.</source>
-        <translation>Votre profil de plongée a été mis à jour sur Facebook.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
-        <source>Photo Upload Failed</source>
-        <translation>Échec de l&apos;envoi des photos</translation>
+        <source>Your dive profile was updated to Facebook.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="250"/>
-        <source>Your dive profile was not updated to facebook, 
+        <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
-        <translation>Votre profil de plongée n&apos;a pas été mis à jour sur Facebook, 
-veuillez envoyer les informations suivantes aux développeurs. </translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+        <source>Photo Upload Failed</source>
+        <translation>Échec de l&apos;envoi des photos</translation>
     </message>
 </context>
 <context>
@@ -2489,17 +2682,17 @@ veuillez envoyer les informations suivantes aux développeurs. </translation>
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1544"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1621"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Cette fonctionnalité n&apos;est pas disponible pour l&apos;ordinateur de plongé sélectionné</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1624"/>
         <source>Firmware update failed!</source>
         <translation>La mise à jour du firmware à échoué !</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1550"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1627"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Impossible de se connecter à l&apos;ordinateur de plongée.</translation>
     </message>
@@ -2507,7 +2700,7 @@ veuillez envoyer les informations suivantes aux développeurs. </translation>
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="128"/>
+        <location filename="../qt-ui/globe.cpp" line="119"/>
         <source>Edit selected dive locations</source>
         <translation>Modifier les lieux de plongée sélectionnés</translation>
     </message>
@@ -2515,7 +2708,7 @@ veuillez envoyer les informations suivantes aux développeurs. </translation>
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="566"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="549"/>
         <source>Location: </source>
         <translation>Lieu : </translation>
     </message>
@@ -2523,7 +2716,7 @@ veuillez envoyer les informations suivantes aux développeurs. </translation>
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="286"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="283"/>
         <source>No location set</source>
         <translation>Lieu non défini</translation>
     </message>
@@ -2531,330 +2724,335 @@ veuillez envoyer les informations suivantes aux développeurs. </translation>
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="133"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
+        <location filename="../qt-ui/maintab.cpp" line="497"/>
         <source>Location</source>
         <translation>Lieu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="67"/>
         <source>Coordinates</source>
         <translation>Coordonnées</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="169"/>
         <source>Divemaster</source>
         <translation>Moniteur / Guide de palanquée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="154"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Buddy</source>
         <translation>Équipier</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="222"/>
+        <location filename="../qt-ui/maintab.ui" line="277"/>
         <source>Tags</source>
         <translation>Étiquettes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="186"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
         <source>Rating</source>
         <translation>Évaluation</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="221"/>
         <source>Visibility</source>
         <translation>Visibilité</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="230"/>
         <source>Suit</source>
         <translation>Combinaison</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="465"/>
+        <location filename="../qt-ui/maintab.cpp" line="470"/>
         <source>Dive notes</source>
         <translation>Notes de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
-        <location filename="../qt-ui/maintab.ui" line="648"/>
-        <location filename="../qt-ui/maintab.cpp" line="277"/>
+        <location filename="../qt-ui/maintab.ui" line="74"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="102"/>
+        <location filename="../qt-ui/maintab.ui" line="677"/>
+        <location filename="../qt-ui/maintab.cpp" line="279"/>
         <source>Air temp.</source>
         <translation>Temp. de l&apos;air</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <location filename="../qt-ui/maintab.ui" line="667"/>
-        <location filename="../qt-ui/maintab.cpp" line="278"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.ui" line="696"/>
+        <location filename="../qt-ui/maintab.cpp" line="280"/>
         <source>Water temp.</source>
         <translation>Temp. de l&apos;eau</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="229"/>
-        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.ui" line="284"/>
+        <location filename="../qt-ui/maintab.cpp" line="498"/>
         <source>Notes</source>
         <translation>Notes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="369"/>
+        <location filename="../qt-ui/maintab.ui" line="398"/>
         <source>Equipment</source>
         <translation>Équipement</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="496"/>
+        <location filename="../qt-ui/maintab.ui" line="525"/>
         <source>Gases used</source>
         <translation>Gaz utilisés</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="515"/>
+        <location filename="../qt-ui/maintab.ui" line="544"/>
         <source>Gas consumed</source>
         <translation>Gaz consommé</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="553"/>
+        <location filename="../qt-ui/maintab.ui" line="582"/>
         <source>CNS</source>
         <translation>SNC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="591"/>
+        <location filename="../qt-ui/maintab.ui" line="620"/>
         <source>Max. depth</source>
         <translation>Prof. Max.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="629"/>
+        <location filename="../qt-ui/maintab.ui" line="658"/>
         <source>Air pressure</source>
         <translation>Pression de l&apos;air</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="686"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>Dive time</source>
         <translation>Durée de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="845"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
         <source>Total time</source>
         <translation>Durée totale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="903"/>
+        <location filename="../qt-ui/maintab.ui" line="932"/>
         <source>Gas consumption</source>
         <translation>Consommation de gaz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="962"/>
+        <location filename="../qt-ui/maintab.ui" line="991"/>
         <source>Extra data</source>
         <translation>Donnée supplémentaires</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="968"/>
+        <location filename="../qt-ui/maintab.ui" line="997"/>
         <source>Additional data from dive computer</source>
         <translation>Donnée supplémentaires de l&apos;ordinateur de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="54"/>
-        <location filename="../qt-ui/maintab.ui" line="458"/>
+        <location filename="../qt-ui/maintab.ui" line="83"/>
+        <location filename="../qt-ui/maintab.ui" line="487"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="61"/>
+        <location filename="../qt-ui/maintab.ui" line="90"/>
         <source>Time</source>
         <translation>Heure</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="425"/>
+        <location filename="../qt-ui/maintab.ui" line="454"/>
         <source>Dive info</source>
         <translation>Info de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="477"/>
+        <location filename="../qt-ui/maintab.ui" line="506"/>
         <source>Interval</source>
         <translation>Intervalle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="534"/>
-        <location filename="../qt-ui/maintab.ui" line="799"/>
+        <location filename="../qt-ui/maintab.ui" line="563"/>
+        <location filename="../qt-ui/maintab.ui" line="828"/>
         <source>SAC</source>
         <translation>Consommation d&apos;air (SAC)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="610"/>
+        <location filename="../qt-ui/maintab.ui" line="639"/>
         <source>Avg. depth</source>
         <translation>Prof. moyenne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="572"/>
+        <location filename="../qt-ui/maintab.ui" line="601"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="734"/>
         <source>Salinity</source>
         <translation>Salinité</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="742"/>
+        <location filename="../qt-ui/maintab.ui" line="771"/>
         <source>Stats</source>
         <translation>Stats</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="775"/>
+        <location filename="../qt-ui/maintab.ui" line="804"/>
         <source>Depth</source>
         <translation>Profondeur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="787"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Temperature</source>
         <translation>Température</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="813"/>
+        <location filename="../qt-ui/maintab.ui" line="842"/>
         <source>Duration</source>
         <translation>Durée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="864"/>
+        <location filename="../qt-ui/maintab.ui" line="893"/>
         <source>Dives</source>
         <translation>Plongées</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="948"/>
+        <location filename="../qt-ui/maintab.ui" line="977"/>
         <source>Photos</source>
         <translation>Photos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="95"/>
+        <location filename="../qt-ui/maintab.cpp" line="87"/>
         <source>Cylinders</source>
         <translation>Blocs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="99"/>
+        <location filename="../qt-ui/maintab.cpp" line="91"/>
         <source>Weights</source>
         <translation>Poids</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="55"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Apply changes</source>
         <translation>Appliquer les modifications</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="59"/>
+        <location filename="../qt-ui/maintab.cpp" line="50"/>
         <source>Discard changes</source>
         <translation>Annuler les modifications</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="96"/>
+        <location filename="../qt-ui/maintab.cpp" line="88"/>
         <source>Add cylinder</source>
         <translation>Ajouter un bloc</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="100"/>
+        <location filename="../qt-ui/maintab.cpp" line="92"/>
         <source>Add weight system</source>
         <translation>Ajouter un système de poids</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="274"/>
+        <location filename="../qt-ui/maintab.cpp" line="276"/>
         <source>Air temp. [%1]</source>
         <translation>Temp. de l&apos;air. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="275"/>
+        <location filename="../qt-ui/maintab.cpp" line="277"/>
         <source>Water temp. [%1]</source>
         <translation>Temp. de l&apos;eau. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="312"/>
+        <location filename="../qt-ui/maintab.cpp" line="314"/>
         <source>This trip is being edited.</source>
         <translation>Ce voyage est en cours d&apos;édition.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="320"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Multiple dives are being edited.</source>
         <translation>Plusieurs plongées sont en cours d&apos;édition.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.cpp" line="324"/>
         <source>This dive is being edited.</source>
         <translation>Cette plongée est en cours d&apos;édition.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="436"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
+        <location filename="../qt-ui/maintab.cpp" line="465"/>
         <source>Trip notes</source>
         <translation>Notes de voyage</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="458"/>
+        <location filename="../qt-ui/maintab.cpp" line="463"/>
         <source>Trip location</source>
         <translation>Lieu du voyage</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="526"/>
-        <location filename="../qt-ui/maintab.cpp" line="558"/>
-        <location filename="../qt-ui/maintab.cpp" line="562"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
         <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="574"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="555"/>
+        <location filename="../qt-ui/maintab.cpp" line="563"/>
         <source>Deepest dive</source>
         <translation>Plongée la plus profonde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="556"/>
+        <location filename="../qt-ui/maintab.cpp" line="564"/>
         <source>Shallowest dive</source>
         <translation>Plongée la moins profonde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="569"/>
+        <location filename="../qt-ui/maintab.cpp" line="577"/>
         <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="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="578"/>
         <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="571"/>
+        <location filename="../qt-ui/maintab.cpp" line="579"/>
         <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="582"/>
+        <location filename="../qt-ui/maintab.cpp" line="590"/>
         <source>Highest temperature</source>
         <translation>Température maximale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="583"/>
+        <location filename="../qt-ui/maintab.cpp" line="591"/>
         <source>Lowest temperature</source>
         <translation>Température minimale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="584"/>
+        <location filename="../qt-ui/maintab.cpp" line="592"/>
         <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="594"/>
+        <location filename="../qt-ui/maintab.cpp" line="602"/>
         <source>Longest dive</source>
         <translation>Plongée la plus longue</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="595"/>
+        <location filename="../qt-ui/maintab.cpp" line="603"/>
         <source>Shortest dive</source>
         <translation>Plongée la plus courte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="596"/>
+        <location filename="../qt-ui/maintab.cpp" line="604"/>
         <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="620"/>
+        <location filename="../qt-ui/maintab.cpp" line="628"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -2863,17 +3061,17 @@ mélangés à partir de l&apos;air et en utilisant :
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="624"/>
+        <location filename="../qt-ui/maintab.cpp" line="632"/>
         <source> and </source>
         <translation> et </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="911"/>
+        <location filename="../qt-ui/maintab.cpp" line="925"/>
         <source>Discard the changes?</source>
         <translation>Abandonner les modifications ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="912"/>
+        <location filename="../qt-ui/maintab.cpp" line="926"/>
         <source>You are about to discard your changes.</source>
         <translation>Vous perdrez les modifications non enregistrées.</translation>
     </message>
@@ -3020,7 +3218,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="296"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="232"/>
         <source>Open</source>
         <translation>Ouvrir</translation>
     </message>
@@ -3380,90 +3578,90 @@ p, li { white-space: pre-wrap; }
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="252"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="229"/>
         <source>Open file</source>
         <translation>Ouvrir un fichier</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="256"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="233"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="332"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="309"/>
         <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="444"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
         <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="491"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
         <source>Print runtime table</source>
         <translation>Imprimer le tableau de runtime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="834"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="811"/>
         <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="836"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="813"/>
         <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="841"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="818"/>
         <source>Save changes?</source>
         <translation>Enregistrer les modifications ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1196"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1173"/>
         <source>Save file as</source>
         <translation>Enregistrer le fichier sous</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1337"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1314"/>
         <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="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="819"/>
         <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="300"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="444"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="277"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Warning</source>
         <translation>Avertissement</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1180"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1157"/>
         <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="625"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="602"/>
         <source>Yearly statistics</source>
         <translation>Statistiques annuelles</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1197"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1174"/>
         <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="1338"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1315"/>
         <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source>
         <translation>Fichiers de carnets de plongées (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Fichiers Cochran (*.can);;Fichiers CSV (*.csv);;Fichiers DiveLog.de (*.dld);;Fichiers JDiveLog (*.jlb);;Fichiers Liquivision (*.lvd);;Fichiers MkVI (*.txt);;Fichiers Suunto (*.sde *.db);;Fichiers Divesoft (*.dlf);;Fichiers UDDF/UDCF (*.uddf *.udcf);;Fichiers XML (*.xml);;Tous les fichiers (*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <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>
@@ -3471,7 +3669,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="651"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="634"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Le Filtre affiche %1 (de %2) plongées</translation>
     </message>
@@ -3479,12 +3677,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="239"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation>Vous devriez mettre à jour le firmware de votre ordinateur de plongée : vous utilisez actuellement la version %1 et la dernière version stable est la %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="243"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
@@ -3493,27 +3691,27 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même préparation que pour un téléchargement d&apos;historique avant de continuer avec la mise à jour</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="244"/>
         <source>Not now</source>
         <translation>Pas maintenant</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="245"/>
         <source>Update firmware</source>
         <translation>Mettre à jour le firmware</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
         <source>Firmware upgrade notice</source>
         <translation>Information de mise à jour de firmware</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
         <source>Save the downloaded firmware as</source>
         <translation>Enregistrer le firmware téléchargé sous</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
         <source>HEX files (*.hex)</source>
         <translation>Fichiers HEX (*.hex)</translation>
     </message>
@@ -3521,54 +3719,69 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Open circuit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>ft/min</source>
         <translation>pieds/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="481"/>
         <source>Last stop at 20ft</source>
         <translation>Dernier palier à 20 pieds</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="482"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% de la prof. moyenne à 20 pieds</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="489"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
         <source>20ft to surface</source>
         <translation>20 pieds à la surface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="485"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
         <source>Last stop at 6m</source>
         <translation>Dernier palier à 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% de la profondeur moyenne à 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="494"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
         <source>6m to surface</source>
         <translation>6m à la surface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="497"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="498"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
         <source>cuft/min</source>
         <translation>pieds³/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="506"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="507"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="500"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="501"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
@@ -3687,6 +3900,7 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="816"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -3721,57 +3935,87 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="795"/>
+        <source>CCR: Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="809"/>
+        <source>Default CCR set-point for dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="832"/>
+        <source>pSCR O₂ metabolism rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="839"/>
+        <source>pSCR ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="846"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="859"/>
+        <source>1:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="875"/>
         <source>System default</source>
         <translation>Paramètre système par défaut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="843"/>
+        <location filename="../qt-ui/preferences.ui" line="914"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="849"/>
+        <location filename="../qt-ui/preferences.ui" line="920"/>
         <source>Proxy type</source>
         <translation>Type de proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="862"/>
+        <location filename="../qt-ui/preferences.ui" line="933"/>
         <source>Host</source>
         <translation>Hôte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="888"/>
+        <location filename="../qt-ui/preferences.ui" line="959"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="914"/>
+        <location filename="../qt-ui/preferences.ui" line="985"/>
         <source>Requires authentication</source>
         <translation>Requiert une authentification</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="934"/>
+        <location filename="../qt-ui/preferences.ui" line="1005"/>
         <source>Username</source>
         <translation>Nom d&apos;utilisateur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="957"/>
+        <location filename="../qt-ui/preferences.ui" line="1028"/>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="985"/>
-        <source>about:blank</source>
-        <translation>about:blank</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="1011"/>
-        <source>Disconnect from facebook</source>
-        <translation>Se déconnecter de Facebook</translation>
+        <location filename="../qt-ui/preferences.ui" line="1079"/>
+        <source>Disconnect from Facebook</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="824"/>
+        <location filename="../qt-ui/preferences.ui" line="895"/>
         <source>Filter</source>
         <translation>Filtre</translation>
     </message>
@@ -3926,52 +4170,52 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="28"/>
+        <location filename="../qt-ui/preferences.cpp" line="44"/>
         <source>No proxy</source>
         <translation>Sans proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="29"/>
+        <location filename="../qt-ui/preferences.cpp" line="45"/>
         <source>System proxy</source>
         <translation>Proxy système</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="30"/>
+        <location filename="../qt-ui/preferences.cpp" line="46"/>
         <source>HTTP proxy</source>
         <translation>Proxy HTTP</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="31"/>
+        <location filename="../qt-ui/preferences.cpp" line="47"/>
         <source>SOCKS proxy</source>
         <translation>Proxy SOCKS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="291"/>
+        <location filename="../qt-ui/preferences.cpp" line="324"/>
         <source>Restart required</source>
         <translation>Redémarrage nécessaire</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="292"/>
+        <location filename="../qt-ui/preferences.cpp" line="325"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>Vous devez redémarrer Subsurface pour prendre en compte la nouvelle langue.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="456"/>
+        <location filename="../qt-ui/preferences.cpp" line="494"/>
         <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
         <translation>Si vous cliquez sur OK, tous les paramètres de Subsurface vont être remis à leur valeur par défaut. Cela s&apos;appliquera immédiatement.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Fichiers XML Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Open default log file</source>
         <translation>Ouvrir le carnet de plongée par défaut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="455"/>
+        <location filename="../qt-ui/preferences.cpp" line="493"/>
         <source>Warning</source>
         <translation>Avertissement</translation>
     </message>
@@ -3979,17 +4223,17 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="91"/>
+        <location filename="../qt-ui/printdialog.cpp" line="85"/>
         <source>&amp;Preview</source>
         <translation>&amp;Prévisualisation</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="88"/>
+        <location filename="../qt-ui/printdialog.cpp" line="82"/>
         <source>P&amp;rint</source>
         <translation>&amp;Impression</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="103"/>
+        <location filename="../qt-ui/printdialog.cpp" line="97"/>
         <source>Print</source>
         <translation>Imprimer</translation>
     </message>
@@ -3997,42 +4241,42 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="20"/>
         <source>Dive#</source>
         <translation>Plongée n°</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="21"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="22"/>
         <source>Depth</source>
         <translation>Profondeur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="23"/>
         <source>Duration</source>
         <translation>Durée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Master</source>
         <translation>Moniteur / Guide de palanquée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Buddy</source>
         <translation>Équipier</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="34"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Location</source>
         <translation>Lieu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <location filename="../qt-ui/printlayout.cpp" line="63"/>
         <source>Subsurface cannot find a usable printer on this system!</source>
         <translation>Subsurface n&apos;a pas pu trouver d&apos;imprimante utilisable sur ce système !</translation>
     </message>
@@ -4098,72 +4342,72 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2095"/>
+        <location filename="../qt-ui/models.cpp" line="2101"/>
         <source>unknown</source>
         <translation>inconnu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2100"/>
+        <location filename="../qt-ui/models.cpp" line="2106"/>
         <source>Dive #%1 - %2</source>
         <translation>Plongée n°%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2103"/>
+        <location filename="../qt-ui/models.cpp" line="2109"/>
         <source>Max depth: %1 %2</source>
         <translation>Profondeur max : %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2110"/>
+        <location filename="../qt-ui/models.cpp" line="2116"/>
         <source>Duration: %1 min</source>
         <translation>Durée : %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2115"/>
+        <location filename="../qt-ui/models.cpp" line="2121"/>
         <source>Gas used:</source>
         <translation>Gaz utilisé :</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2117"/>
+        <location filename="../qt-ui/models.cpp" line="2123"/>
         <source>Tags:</source>
         <translation>Étiquettes :</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2119"/>
+        <location filename="../qt-ui/models.cpp" line="2125"/>
         <source>SAC:</source>
         <translation>Consommation d&apos;air (SAC) :</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2121"/>
+        <location filename="../qt-ui/models.cpp" line="2127"/>
         <source>Weights:</source>
         <translation>Poids :</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2126"/>
+        <location filename="../qt-ui/models.cpp" line="2132"/>
         <source>Notes:</source>
         <translation>Notes :</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2133"/>
+        <location filename="../qt-ui/models.cpp" line="2139"/>
         <source>Divemaster:</source>
         <translation>Moniteur / Guide de palanquée :</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2135"/>
+        <location filename="../qt-ui/models.cpp" line="2141"/>
         <source>Buddy:</source>
         <translation>Équipier :</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2137"/>
+        <location filename="../qt-ui/models.cpp" line="2143"/>
         <source>Suit:</source>
         <translation>Combinaison :</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2139"/>
+        <location filename="../qt-ui/models.cpp" line="2145"/>
         <source>Viz:</source>
         <translation>Visi :</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2141"/>
+        <location filename="../qt-ui/models.cpp" line="2147"/>
         <source>Rating:</source>
         <translation>Évaluation :</translation>
     </message>
@@ -4171,103 +4415,108 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="628"/>
         <source> (#%1 of %2)</source>
         <translation> (n°%1 sur %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="630"/>
+        <source>Unknown dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="647"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>L&apos;affichage de la LND/DTR est désactivée à cause d&apos;un temps de calcul excessif</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1168"/>
         <source>Make first divecomputer</source>
         <translation>Définir comme ordinateur de plongée principal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Delete this divecomputer</source>
         <translation>Supprimer cet ordinateur de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1184"/>
         <source>Add gas change</source>
         <translation>Ajouter un changement de gaz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1187"/>
         <source> (Tank %1)</source>
         <translation> (Bloc %1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1195"/>
         <source>Add set-point change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1197"/>
         <source>Add bookmark</source>
         <translation>Ajouter un signet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
         <source>Remove event</source>
         <translation>Supprimer l&apos;évènement</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1206"/>
         <source>Hide similar events</source>
         <translation>Masquer les évènements similaires</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1213"/>
         <source>Edit name</source>
         <translation>Modifier le nom</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1242"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1249"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>Ajuster la pression du bloc %1 (actuellement interpolé comme %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1264"/>
         <source>Unhide all events</source>
         <translation>Afficher tous les évènements</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide events</source>
         <translation>Masquer les évènements</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide all %1 events?</source>
         <translation>Masquer tous les évènements %1 ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1333"/>
         <source>Remove the selected event?</source>
         <translation>Supprimer l&apos;évènement sélectionné ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1334"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1424"/>
         <source>Edit name of bookmark</source>
         <translation>Modifier le nom du signet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
         <source>Custom name:</source>
         <translation>Nom personnalisé :</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1430"/>
         <source>Name is too long!</source>
         <translation>Le nom est trop long !</translation>
     </message>
@@ -4275,102 +4524,102 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>AIR</source>
         <translation>AIR</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>OXYGEN</source>
         <translation>OXYGÈNE</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="208"/>
         <source>Remove this point</source>
         <translation>Supprimer ce point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="57"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="42"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="25"/>
         <source>Average</source>
         <translation>Moyenne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="45"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="28"/>
         <source>Minimum</source>
         <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="48"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="31"/>
         <source>Maximum</source>
         <translation>Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="297"/>
+        <location filename="../qt-ui/globe.cpp" line="296"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>Déplacez la carte et double cliquez pour définir le lieu de la plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="525"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="526"/>
         <source>lbs</source>
         <translation>livre US</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="550"/>
         <source>ft</source>
         <translation>pieds</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="551"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="570"/>
+        <location filename="../qt-ui/models.cpp" line="574"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="571"/>
+        <location filename="../qt-ui/models.cpp" line="575"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="595"/>
+        <location filename="../qt-ui/models.cpp" line="599"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="596"/>
+        <location filename="../qt-ui/models.cpp" line="600"/>
         <source>cuft</source>
         <translation>pieds³</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="513"/>
         <source>Invalid response from server</source>
         <translation>Réponse invalide du serveur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation>Le tag XML  &apos;DiveDateReader&apos; est attendu, &apos;%1&apos; a été obtenu à la place</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="567"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation>Le tag XML &apos;DiveDates&apos; attendu n&apos;a pas été trouvé</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Réponse XML mal formée. Ligne %1: %2</translation>
     </message>
@@ -4378,12 +4627,12 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1450"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1518"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Cette fonctionnalité n&apos;est pas disponible pour l&apos;ordinateur de plongé sélectionné.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1442"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Impossible de se connecter à l&apos;ordinateur de plongée.</translation>
     </message>
@@ -4397,12 +4646,12 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
-        <location filename="../qt-ui/simplewidgets.cpp" line="151"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="134"/>
         <source>New starting number</source>
         <translation>Nouveau numéro de départ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="149"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="132"/>
         <source>New number</source>
         <translation>Nouveau numéro</translation>
     </message>
@@ -4410,12 +4659,12 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1575"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1653"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Cette fonctionnalité n&apos;est pas disponible pour l&apos;ordinateur de plongé sélectionné.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1579"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1657"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Impossible de se connecter à l&apos;ordinateur de plongée.</translation>
     </message>
@@ -4494,12 +4743,12 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
         <translation>Quelle est l&apos;heure et la date affiché par l&apos;image ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="276"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="259"/>
         <source>Open image file</source>
         <translation>Ouvrir un fichier image</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="278"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="261"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Fichiers image (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -4552,10 +4801,9 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
     <name>SocialNetworkDialog</name>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="282"/>
-        <source>Dive Date: %1 
+        <source>Dive date: %1 
 </source>
-        <translation>Date de plongée : %1 
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="285"/>
@@ -4578,10 +4826,9 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="290"/>
-        <source>Dive Location: %1 
+        <source>Dive location: %1 
 </source>
-        <translation>Lieu de plongée : %1 
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="293"/>
@@ -4699,47 +4946,47 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="329"/>
         <source>Webservice</source>
         <translation>Service web</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="393"/>
         <source>Connecting...</source>
         <translation>Connexion en cours...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
         <source>Download finished</source>
         <translation>Téléchargement terminé</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Download error: %1</source>
         <translation>Erreur de téléchargement : %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="436"/>
         <source>Connection error: </source>
         <translation>Erreur de connexion : </translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
         <source>Download successful</source>
         <translation>Téléchargement réussi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="439"/>
         <source>Invalid user identifier!</source>
         <translation>Identifiant utilisateur incorrect !</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="312"/>
         <source>Enter User ID and click Download</source>
         <translation>Entrez l&apos;ID utilisateur et cliquez sur télécharger</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="442"/>
         <source>Cannot parse response!</source>
         <translation>Impossible d&apos;analyser la réponse !</translation>
     </message>
@@ -4747,7 +4994,7 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="592"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="575"/>
         <source>Suits: </source>
         <translation>Combinaisons : </translation>
     </message>
@@ -4755,7 +5002,7 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="119"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="116"/>
         <source>No suit set</source>
         <translation>Pas de combinaison définie</translation>
     </message>
@@ -4772,7 +5019,7 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="513"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="496"/>
         <source>Tags: </source>
         <translation>Étiquettes : </translation>
     </message>
@@ -4780,7 +5027,7 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="144"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="141"/>
         <source>Empty tags</source>
         <translation>Étiquettes vides</translation>
     </message>
@@ -4788,17 +5035,17 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -4806,7 +5053,7 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="141"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="131"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
@@ -4814,7 +5061,7 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1090"/>
+        <location filename="../qt-ui/models.cpp" line="1094"/>
         <source> (%1 shown)</source>
         <translation> (%1 affiché)</translation>
     </message>
@@ -4822,72 +5069,72 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="64"/>
         <source>Check for updates.</source>
         <translation>Vérifier les mises à jour.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="66"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface n&apos;a pas été en mesure de vérifier les mises à jour.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="70"/>
         <source>The following error occurred:</source>
         <translation>L&apos;erreur suivante est apparue :</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="72"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
         <source>Please check your internet connection.</source>
         <translation>Vérifiez votre connexion Internet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="85"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="84"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>Vous utilisez la dernière version de Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="88"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>Une nouvelle version de Subsurface est disponible.&lt;br/&gt;Téléchargez-là sur :&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="95"/>
         <source>A new version of Subsurface is available.</source>
         <translation>Une nouvelle version de Subsurface est disponible.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="97"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
         <source>Latest version is %1, please check with your OS vendor for updates.</source>
         <translation>La dernière version est %1, renseignez-vous auprès de votre fournisseur pour d&apos;éventuelles mises à jour.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="103"/>
         <source>Newest release version is </source>
         <translation>La version la plus récente est </translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="105"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
         <source>The server returned the following information:</source>
         <translation>Le serveur a renvoyé l&apos;information suivante :</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="121"/>
         <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation>Subsurface vérifie toutes les deux semaines si une nouvelle version est disponible. Si vous ne souhaitez plus que Subsurface fasse cette vérification par lui même, cliquez sur Refuser.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
         <source>Decline</source>
         <translation>Refuser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="124"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
         <source>Accept</source>
         <translation>Accepter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="126"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="125"/>
         <source>Automatic check for updates</source>
         <translation>Vérification automatique des mises à jour</translation>
     </message>
@@ -4895,13 +5142,13 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
 <context>
     <name>UserManual</name>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="55"/>
+        <location filename="../qt-ui/usermanual.cpp" line="54"/>
         <source>User Manual</source>
         <translation>Manuel utilisateur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="72"/>
-        <location filename="../qt-ui/usermanual.cpp" line="78"/>
+        <location filename="../qt-ui/usermanual.cpp" line="71"/>
+        <location filename="../qt-ui/usermanual.cpp" line="77"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Impossible de trouver le manuel de Subsurface</translation>
     </message>
@@ -4979,58 +5226,58 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
         <translation>D&apos;où importez-vous vos données ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
         <source>
 Operating System: %1</source>
         <translation>
 Système d&apos;exploitation : %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 Architecture CPU : %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 Language: %1</source>
         <translation>
 Langue : %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="93"/>
         <source>Should we ask you later?</source>
         <translation>Devons-nous vous le demander ultérieurement ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Don&apos;t ask me again</source>
         <translation>Ne plus demander</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Ask later</source>
         <translation>Demander plus tard</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
         <source>Submit user survey.</source>
         <translation>Soumettre le sondage</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask again?</source>
         <translation>Demander à nouveau ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="17"/>
         <source>Send</source>
         <translation>Envoyer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>
@@ -5038,27 +5285,27 @@ OS CPU Architecture: %1</source>
 Architecture OS CPU : %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation>Subsurface n&apos;a pas pu soumettre le sondage utilisateur.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="121"/>
         <source>The following error occurred:</source>
         <translation>L&apos;erreur suivante est apparue :</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>Please check your internet connection.</source>
         <translation>Vérifiez votre connexion Internet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="131"/>
         <source>Survey successfully submitted.</source>
         <translation>Sondage soumis avec succès.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="136"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation>Il y a eu une erreur lors de la recherche des mises à jours.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -5066,12 +5313,12 @@ Architecture OS CPU : %1</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -5119,12 +5366,12 @@ Architecture OS CPU : %1</translation>
         <translation>Envoyer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="247"/>
         <source>Operation timed out</source>
         <translation>Temps de réponse dépassé pour l&apos;opération</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="268"/>
         <source>Transferring data...</source>
         <translation>Transfert des données en cours...</translation>
     </message>
@@ -5132,17 +5379,17 @@ Architecture OS CPU : %1</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Weight</source>
         <translation>Poids</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="496"/>
+        <location filename="../qt-ui/models.cpp" line="500"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Cliquer ici retirera ce système de poids.</translation>
     </message>
@@ -5150,19 +5397,19 @@ Architecture OS CPU : %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1479"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1487"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1497"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1555"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1566"/>
         <source>Failed!</source>
         <translation>Échec !</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1506"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1576"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Cette fonctionnalité n&apos;est pas disponible pour l&apos;ordinateur de plongé sélectionné.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1580"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Impossible de se connecter à l&apos;ordinateur de plongée.</translation>
     </message>
@@ -5170,79 +5417,79 @@ Architecture OS CPU : %1</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1841"/>
+        <location filename="../qt-ui/models.cpp" line="1847"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Année 
  &gt; Mois / Voyage</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1844"/>
+        <location filename="../qt-ui/models.cpp" line="1850"/>
         <source>#</source>
         <translation>N°</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1847"/>
+        <location filename="../qt-ui/models.cpp" line="1853"/>
         <source>Duration 
  Total</source>
         <translation>Durée 
  Totale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1850"/>
+        <location filename="../qt-ui/models.cpp" line="1856"/>
         <source>
 Average</source>
         <translation>
 Moyenne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1853"/>
+        <location filename="../qt-ui/models.cpp" line="1859"/>
         <source>
 Shortest</source>
         <translation>
 La plus courte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1856"/>
+        <location filename="../qt-ui/models.cpp" line="1862"/>
         <source>
 Longest</source>
         <translation>
 La plus longue</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1859"/>
+        <location filename="../qt-ui/models.cpp" line="1865"/>
         <source>Depth (%1)
  Average</source>
         <translation>Profondeur (%1)
  Moyenne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1862"/>
-        <location filename="../qt-ui/models.cpp" line="1871"/>
-        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>
 Minimum</source>
         <translation>
 Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1865"/>
-        <location filename="../qt-ui/models.cpp" line="1874"/>
-        <location filename="../qt-ui/models.cpp" line="1883"/>
+        <location filename="../qt-ui/models.cpp" line="1871"/>
+        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>
 Maximum</source>
         <translation>
 Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1874"/>
         <source>SAC (%1)
  Average</source>
         <translation>Consommation d&apos;air (SAC) (%1)
  Moyenne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1883"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -5323,40 +5570,40 @@ Maximum</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1508"/>
+        <location filename="../dive.c" line="1530"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) ou (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="464"/>
+        <location filename="../divelist.c" line="467"/>
         <location filename="../equipment.c" line="81"/>
-        <location filename="../planner.c" line="1060"/>
-        <location filename="../planner.c" line="1063"/>
+        <location filename="../planner.c" line="1081"/>
+        <location filename="../planner.c" line="1084"/>
         <source>air</source>
         <translation>air</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="192"/>
+        <location filename="../equipment.c" line="194"/>
         <source>integrated</source>
         <translation>intégré</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="193"/>
+        <location filename="../equipment.c" line="195"/>
         <source>belt</source>
         <translation>ceinture</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="194"/>
+        <location filename="../equipment.c" line="196"/>
         <source>ankle</source>
         <translation>cheville</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="195"/>
+        <location filename="../equipment.c" line="197"/>
         <source>backplate weight</source>
         <translation>poids dorsaux</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="196"/>
+        <location filename="../equipment.c" line="198"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -5364,7 +5611,7 @@ Maximum</translation>
         <location filename="../file.c" line="112"/>
         <location filename="../file.c" line="434"/>
         <location filename="../file.c" line="506"/>
-        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="925"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Impossible de lire &apos;%s&apos;</translation>
     </message>
@@ -5421,9 +5668,9 @@ Maximum</translation>
         <translation>Pas trouvé d&apos;ordinateur de plongée pour le fichier &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../file.c" line="869"/>
-        <location filename="../file.c" line="909"/>
-        <location filename="../file.c" line="1007"/>
+        <location filename="../file.c" line="870"/>
+        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="1016"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>Le nombre maximum de colonnes supporté pour les importations de fichiers CSV est %d</translation>
     </message>
@@ -5594,27 +5841,27 @@ Maximum</translation>
         <translation>numéro d&apos;évènement non valide</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="421"/>
+        <location filename="../libdivecomputer.c" line="419"/>
         <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="427"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Error registering the data</source>
         <translation>Impossible d&apos;enregistrer les données</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="433"/>
         <source>Error parsing the datetime</source>
         <translation>Impossible d&apos;analyser la date</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Dive %d: %s</source>
         <translation>Plongée %d : %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="455"/>
+        <location filename="../libdivecomputer.c" line="454"/>
         <source>Error parsing the divetime</source>
         <translation>Erreur lors de l&apos;analyse de la durée de plongée</translation>
     </message>
@@ -5624,156 +5871,156 @@ Maximum</translation>
         <translation>Erreur d&apos;analyse de la profondeur maximale</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="482"/>
+        <location filename="../libdivecomputer.c" line="483"/>
         <source>Error parsing temperature</source>
         <translation>Erreur d&apos;analyse de la température</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="501"/>
+        <location filename="../libdivecomputer.c" line="503"/>
         <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="513"/>
+        <location filename="../libdivecomputer.c" line="515"/>
         <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="521"/>
+        <location filename="../libdivecomputer.c" line="524"/>
         <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="545"/>
+        <location filename="../libdivecomputer.c" line="549"/>
         <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="562"/>
+        <location filename="../libdivecomputer.c" line="569"/>
         <source>Error parsing the gas mix</source>
         <translation>Erreur d&apos;analyse du mélange gazeux</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="569"/>
+        <location filename="../libdivecomputer.c" line="576"/>
         <source>Error parsing the samples</source>
         <translation>Erreur d&apos;analyse des échantillons</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="706"/>
+        <location filename="../libdivecomputer.c" line="713"/>
         <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="714"/>
+        <location filename="../libdivecomputer.c" line="721"/>
         <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="778"/>
+        <location filename="../libdivecomputer.c" line="785"/>
         <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="783"/>
+        <location filename="../libdivecomputer.c" line="790"/>
         <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="804"/>
+        <location filename="../libdivecomputer.c" line="811"/>
         <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="843"/>
+        <location filename="../libdivecomputer.c" line="850"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Impossible de créer un contexte libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="850"/>
+        <location filename="../libdivecomputer.c" line="857"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Impossible d&apos;ouvrir %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="858"/>
+        <location filename="../libdivecomputer.c" line="865"/>
         <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>
     <message>
-        <location filename="../parse-xml.c" line="506"/>
+        <location filename="../parse-xml.c" line="516"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Valeur de pourcentage étrange lue %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1760"/>
+        <location filename="../parse-xml.c" line="1770"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Impossible d&apos;analyser &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1989"/>
-        <location filename="../parse-xml.c" line="2137"/>
+        <location filename="../parse-xml.c" line="1999"/>
+        <location filename="../parse-xml.c" line="2147"/>
         <source>Database query dm4_events failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1996"/>
-        <location filename="../parse-xml.c" line="2144"/>
+        <location filename="../parse-xml.c" line="2006"/>
+        <location filename="../parse-xml.c" line="2154"/>
         <source>Database query dm4_tags failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2318"/>
+        <location filename="../parse-xml.c" line="2328"/>
         <source>Database query shearwater_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2325"/>
+        <location filename="../parse-xml.c" line="2335"/>
         <source>Database query shearwater_changes failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2332"/>
+        <location filename="../parse-xml.c" line="2342"/>
         <source>Database query shearwater_profile_sample failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2451"/>
+        <location filename="../parse-xml.c" line="2461"/>
         <source>Database query cobalt_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2458"/>
+        <location filename="../parse-xml.c" line="2468"/>
         <source>Database query cobalt_buddies failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2465"/>
+        <location filename="../parse-xml.c" line="2475"/>
         <source>Database query cobalt_visibility failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2472"/>
+        <location filename="../parse-xml.c" line="2482"/>
         <source>Database query cobalt_location failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2479"/>
+        <location filename="../parse-xml.c" line="2489"/>
         <source>Database query cobalt_location (site) failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2486"/>
+        <location filename="../parse-xml.c" line="2496"/>
         <source>Database query cobalt_profile_sample failed.
 </source>
         <translation type="unfinished"/>
@@ -5786,17 +6033,17 @@ Maximum</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2168"/>
-        <location filename="../parse-xml.c" line="2189"/>
-        <location filename="../parse-xml.c" line="2508"/>
-        <location filename="../parse-xml.c" line="2527"/>
+        <location filename="../parse-xml.c" line="2178"/>
+        <location filename="../parse-xml.c" line="2199"/>
+        <location filename="../parse-xml.c" line="2518"/>
+        <location filename="../parse-xml.c" line="2537"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Échec de la requête de base de données &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2848"/>
+        <location filename="../parse-xml.c" line="2909"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Impossible d&apos;ouvrir le feuille de style %s</translation>
     </message>
@@ -5806,161 +6053,167 @@ Maximum</translation>
         <translation>Nitrox%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="820"/>
+        <location filename="../planner.c" line="841"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Impossible de trouver le gaz %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="356"/>
+        <location filename="../planner.c" line="363"/>
         <source>Too many gas mixes</source>
         <translation>Trop de gaz différents</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="540"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation>Calcul de la décompression annulé à cause d&apos;une durée excessive</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="548"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation>Basé sur GFlow = %d et GFhigh = %d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="544"/>
+        <location filename="../planner.c" line="551"/>
         <source>Subsurface dive plan</source>
         <translation>Planification de plongée Subsurface</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="548"/>
+        <location filename="../planner.c" line="555"/>
         <source>depth</source>
         <translation>profondeur</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="558"/>
         <source>runtime</source>
         <translation>runtime</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="554"/>
+        <location filename="../planner.c" line="561"/>
         <source>duration</source>
         <translation>durée</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="557"/>
+        <location filename="../planner.c" line="564"/>
         <source>gas</source>
         <translation>gaz</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="594"/>
+        <location filename="../planner.c" line="601"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Transition de %.*f %s en %d:%02d min - runtime %d:%02u sur %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="602"/>
+        <location filename="../planner.c" line="609"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Transition de %.*f %s en %d:%02d min - runtime %d:%02u sur %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="615"/>
+        <location filename="../planner.c" line="622"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Rester à %.*f %s pendant %d:%02d min - runtime %d:%02u sur %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="622"/>
+        <location filename="../planner.c" line="629"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Rester à %.*f %s pendant %d:%02d min - runtime %d:%02u sur %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="635"/>
+        <location filename="../planner.c" line="642"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="638"/>
-        <location filename="../planner.c" line="642"/>
+        <location filename="../planner.c" line="645"/>
+        <location filename="../planner.c" line="649"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="651"/>
+        <location filename="../planner.c" line="658"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="676"/>
+        <location filename="../planner.c" line="683"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Changer de gaz vers %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="678"/>
+        <location filename="../planner.c" line="685"/>
         <source>Switch gas to %s</source>
         <translation>Changer de gaz vers %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="697"/>
+        <location filename="../planner.c" line="704"/>
         <source>CNS</source>
         <translation>SNC</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="699"/>
+        <location filename="../planner.c" line="706"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="710"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Consommation de gaz (segments CCR exclus) :</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="705"/>
+        <location filename="../planner.c" line="712"/>
         <source>Gas consumption:</source>
         <translation>Consommation de gaz :</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="535"/>
-        <location filename="../planner.c" line="725"/>
-        <location filename="../planner.c" line="730"/>
-        <location filename="../planner.c" line="753"/>
+        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="732"/>
+        <location filename="../planner.c" line="737"/>
+        <location filename="../planner.c" line="762"/>
+        <location filename="../planner.c" line="772"/>
         <source>Warning:</source>
         <translation>Avertissement :</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="523"/>
+        <location filename="../planner.c" line="530"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
         <translation>DISCLAIMER / ATTENTION : CECI EST UNE NOUVELLE IMPLÉMENTATION DE L&apos;ALGORITHME DE BÜHLMANN ET SON ADAPTATION DANS UN PLANIFICATEUR DE PLONGÉE QUI N&apos;A ÉTÉ TESTÉ QUE SOMMAIREMENT. NOUS VOUS RECOMMANDONS FORTEMENT DE NE PAS PLANIFIER VOS PLONGÉES EN NE VOUS BASANT QUE SUR LES RÉSULTATS PROPOSÉS ICI.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="726"/>
+        <location filename="../planner.c" line="733"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>C&apos;est plus de gaz que ce qui est disponible dans le bloc spécifié !</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="731"/>
+        <location filename="../planner.c" line="738"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>pas assez de gaz en réserve pour un échange lors de la remontée !</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="733"/>
+        <location filename="../planner.c" line="740"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s de %s (%.0f%s/%.0f%s dans la remontée planifiée)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="735"/>
+        <location filename="../planner.c" line="742"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s durant la remontée planifiée) de %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="759"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>valeur pO₂ haute %.2f à %d:%02u avec le gaz %s à la profondeur %.*f %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="1064"/>
+        <location filename="../planner.c" line="769"/>
+        <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="1085"/>
         <source>ean</source>
         <translation>nitrox</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1099"/>
+        <location filename="../profile.c" line="1113"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -5969,70 +6222,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1102"/>
+        <location filename="../profile.c" line="1116"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1106"/>
+        <location filename="../profile.c" line="1120"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1112"/>
+        <location filename="../profile.c" line="1126"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1115"/>
+        <location filename="../profile.c" line="1129"/>
         <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="1117"/>
+        <location filename="../profile.c" line="1131"/>
         <source>CNS: %u%%
 </source>
         <translation>SNC : %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1119"/>
+        <location filename="../profile.c" line="1133"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1121"/>
+        <location filename="../profile.c" line="1135"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1123"/>
+        <location filename="../profile.c" line="1137"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1140"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD : %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1147"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -6041,7 +6294,7 @@ PEDA : %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1137"/>
+        <location filename="../profile.c" line="1151"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -6050,70 +6303,70 @@ PEDA : %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1149"/>
+        <location filename="../profile.c" line="1163"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Palier de sécurité : %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1152"/>
+        <location filename="../profile.c" line="1166"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Palier de sécurité : temps inconnu @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1157"/>
+        <location filename="../profile.c" line="1171"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Déco : %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1174"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Déco : temps inconnu @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1178"/>
         <source>In deco
 </source>
         <translation>En déco
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1166"/>
+        <location filename="../profile.c" line="1180"/>
         <source>NDL: %umin
 </source>
         <translation>LND  : %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1183"/>
         <source>TTS: %umin
 </source>
         <translation>DTR : %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1172"/>
+        <location filename="../profile.c" line="1186"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Déco : %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1180"/>
+        <location filename="../profile.c" line="1194"/>
         <source>In deco (calc)
 </source>
         <translation>En déco (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1196"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>LND : %umin (calc)
@@ -6121,78 +6374,78 @@ PEDA : %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1185"/>
+        <location filename="../profile.c" line="1199"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>DTR : %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1188"/>
+        <location filename="../profile.c" line="1202"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Plafond calculé %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1194"/>
+        <location filename="../profile.c" line="1208"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Tissus %.0fmin : %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1214"/>
         <source>heartbeat: %d
 </source>
         <translation>rythme cardiaque : %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1202"/>
+        <location filename="../profile.c" line="1216"/>
         <source>bearing: %d
 </source>
         <translation>palier : %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1205"/>
+        <location filename="../profile.c" line="1219"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1314"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1304"/>
-        <location filename="../profile.c" line="1308"/>
-        <location filename="../profile.c" line="1312"/>
+        <location filename="../profile.c" line="1318"/>
+        <location filename="../profile.c" line="1322"/>
+        <location filename="../profile.c" line="1326"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sPd:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1316"/>
+        <location filename="../profile.c" line="1330"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sPd:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1334"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1324"/>
-        <location filename="../profile.c" line="1328"/>
+        <location filename="../profile.c" line="1338"/>
+        <location filename="../profile.c" line="1342"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1335"/>
+        <location filename="../profile.c" line="1349"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -6323,6 +6576,7 @@ PEDA : %d%s
     </message>
     <message>
         <location filename="../dive.c" line="30"/>
+        <location filename="../equipment.c" line="85"/>
         <source>oxygen</source>
         <translation>oxygène</translation>
     </message>
@@ -6377,97 +6631,97 @@ PEDA : %d%s
         <translation>(pas de plongées)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sun</source>
         <translation>Dim.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Mon</source>
         <translation>Lun.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Tue</source>
         <translation>Mar.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Wed</source>
         <translation>Mer.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Thu</source>
         <translation>Jeu.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Fri</source>
         <translation>Ven.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sat</source>
         <translation>Sam.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jan</source>
         <translation>Janv.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Feb</source>
         <translation>Fév.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Mar</source>
         <translation>Mar.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Apr</source>
         <translation>Avril</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jun</source>
         <translation>Juin</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Jul</source>
         <translation>Juil.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Aug</source>
         <translation>Août</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Sep</source>
         <translation>Sept.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Oct</source>
         <translation>Oct.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Nov</source>
         <translation>Nov.</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Dec</source>
         <translation>Déc.</translation>
     </message>
@@ -7071,13 +7325,13 @@ Est-ce que l&apos;Uemis Zurich est branché correctement  ?</translation>
         <translation>Planning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
         <source>GF low</source>
         <translation>GF bas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>%</source>
         <translation>%</translation>
     </message>
@@ -7087,7 +7341,7 @@ Est-ce que l&apos;Uemis Zurich est branché correctement  ?</translation>
         <translation>GF haut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="335"/>
         <source>Drop to first depth</source>
         <translation>Descendre jusqu’à la première profondeur</translation>
     </message>
@@ -7097,69 +7351,69 @@ Est-ce que l&apos;Uemis Zurich est branché correctement  ?</translation>
         <translation>Dernier palier à 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
         <source>Plan backgas breaks</source>
         <translation>Planifier une pause sur le gaz de fond</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="355"/>
         <source>Gas options</source>
         <translation>Option de gaz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="376"/>
         <source>Bottom SAC</source>
         <translation>Consommation d&apos;air (SAC) au fond</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="383"/>
         <source>Deco SAC</source>
         <translation>Consommation d&apos;air (SAC) en déco</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="380"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="390"/>
         <source>Bottom pO₂</source>
         <translation>pO₂ fond</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="403"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="413"/>
         <source>Deco pO₂</source>
         <translation>pO₂ de déco</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="449"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="462"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="478"/>
         <source>Dive notes</source>
         <translation>Notes de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
         <source>Display runtime</source>
         <translation>Afficher le runtime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <source>Display segment duration</source>
         <translation>afficher la durée du segment</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="531"/>
         <source>Display transitions in deco</source>
         <translation>Afficher les transitions dans la décompression</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="538"/>
         <source>Verbatim dive plan</source>
         <translation>Planification de plongée textuelle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="387"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="410"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="397"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -7179,17 +7433,17 @@ Est-ce que l&apos;Uemis Zurich est branché correctement  ?</translation>
         <translation>6m à la surface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="499"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>Sur la planification, afficher le runtime (durée absolue) des paliers</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="515"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>Sur la planification, afficher la durée (durée relative) des paliers</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>Sur la planification, lister les transitions ou les traiter comme implicites</translation>
     </message>
diff --git a/translations/subsurface_he.ts b/translations/subsurface_he.ts
index 6b482a4a1..4a59dd0a1 100644
--- a/translations/subsurface_he.ts
+++ b/translations/subsurface_he.ts
@@ -3,12 +3,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="539"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="522"/>
         <source>Person: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="540"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="523"/>
         <source>Searches for buddies and divemasters</source>
         <translation type="unfinished"/>
     </message>
@@ -16,40 +16,188 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="233"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="230"/>
         <source>No buddies</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>ColumnNameProvider</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>GPS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Avg depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="210"/>
+        <location filename="../configuredivecomputer.cpp" line="212"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="226"/>
+        <location filename="../configuredivecomputer.cpp" line="228"/>
         <source>Could not open backup file: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="542"/>
+        <location filename="../configuredivecomputer.cpp" line="552"/>
         <source>Dive computer details read successfully</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="551"/>
+        <location filename="../configuredivecomputer.cpp" line="561"/>
         <source>Setting successfully written to device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="560"/>
+        <location filename="../configuredivecomputer.cpp" line="570"/>
         <source>Device firmware successfully updated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="569"/>
+        <location filename="../configuredivecomputer.cpp" line="579"/>
         <source>Device settings successfully reset</source>
         <translation type="unfinished"/>
     </message>
@@ -847,70 +995,70 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1053"/>
         <source>Backup files (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1037"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1040"/>
         <source>Backup succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1041"/>
         <source>Your settings have been saved to: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1030"/>
         <source>Backup dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1036"/>
         <source>XML backup error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1052"/>
         <source>Restore dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1056"/>
         <source>XML restore error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1057"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1063"/>
         <source>Restore succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1064"/>
         <source>Your settings have been restored successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1074"/>
         <source>Select firmware file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1075"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -968,12 +1116,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="410"/>
         <source>Cylinder cannot be removed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="407"/>
+        <location filename="../qt-ui/models.cpp" line="411"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation type="unfinished"/>
     </message>
@@ -1049,12 +1197,12 @@
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="48"/>
         <source>Remove the selected dive computer?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="49"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
         <translation>האם אתם בטוחים שברצונכם להסיר את המחשב הנבחר?</translation>
@@ -1068,22 +1216,22 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Model</source>
         <translation>דגם</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Device ID</source>
         <translation>מזהה התקן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Nickname</source>
         <translation>כינוי</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -1091,117 +1239,145 @@
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="115"/>
         <source>Bailing out to OC</source>
         <translation>מעבר חרום למערכת נשימה פתוחה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="117"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>להתחיל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>סוף</translation>
     </message>
 </context>
 <context>
+    <name>DiveImportedModel</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="556"/>
+        <source>Date/time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
+        <source>Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>h:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>min</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1242"/>
+        <location filename="../qt-ui/models.cpp" line="1248"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1245"/>
+        <location filename="../qt-ui/models.cpp" line="1251"/>
         <source>Date</source>
         <translation>תאריך</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1248"/>
+        <location filename="../qt-ui/models.cpp" line="1254"/>
         <source>Rating</source>
         <translation>דירוג</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>m</source>
         <translation>מטר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>ft</source>
         <translation>רגל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1254"/>
+        <location filename="../qt-ui/models.cpp" line="1260"/>
         <source>Duration</source>
         <translation>משך הצלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1263"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>kg</source>
         <translation>קילוגרם</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>lbs</source>
         <translation>ליברה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1263"/>
+        <location filename="../qt-ui/models.cpp" line="1269"/>
         <source>Suit</source>
         <translation>חליפה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1266"/>
+        <location filename="../qt-ui/models.cpp" line="1272"/>
         <source>Cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1269"/>
+        <location filename="../qt-ui/models.cpp" line="1275"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>/min</source>
         <translation>לדקה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1277"/>
+        <location filename="../qt-ui/models.cpp" line="1283"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1280"/>
+        <location filename="../qt-ui/models.cpp" line="1286"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1283"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>Location</source>
         <translation>מיקום</translation>
     </message>
@@ -1209,87 +1385,87 @@
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="787"/>
+        <location filename="../qt-ui/divelistview.cpp" line="768"/>
         <source>Expand all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="788"/>
+        <location filename="../qt-ui/divelistview.cpp" line="769"/>
         <source>Collapse all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="789"/>
+        <location filename="../qt-ui/divelistview.cpp" line="770"/>
         <source>Collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="791"/>
+        <location filename="../qt-ui/divelistview.cpp" line="772"/>
         <source>Remove dive(s) from trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="792"/>
+        <location filename="../qt-ui/divelistview.cpp" line="773"/>
         <source>Create new trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="806"/>
+        <location filename="../qt-ui/divelistview.cpp" line="787"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="808"/>
+        <location filename="../qt-ui/divelistview.cpp" line="789"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="812"/>
+        <location filename="../qt-ui/divelistview.cpp" line="793"/>
         <source>Merge trip with trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="813"/>
+        <location filename="../qt-ui/divelistview.cpp" line="794"/>
         <source>Merge trip with trip below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="817"/>
+        <location filename="../qt-ui/divelistview.cpp" line="798"/>
         <source>Delete dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="819"/>
+        <location filename="../qt-ui/divelistview.cpp" line="800"/>
         <source>Mark dive(s) invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="823"/>
+        <location filename="../qt-ui/divelistview.cpp" line="804"/>
         <source>Merge selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="825"/>
+        <location filename="../qt-ui/divelistview.cpp" line="806"/>
         <source>Renumber dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="826"/>
+        <location filename="../qt-ui/divelistview.cpp" line="807"/>
         <source>Shift times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="827"/>
+        <location filename="../qt-ui/divelistview.cpp" line="808"/>
         <source>Load images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Open image files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation type="unfinished"/>
     </message>
@@ -1474,100 +1650,100 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF קבצי (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="268"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="68"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
         <source>Subsurface native XML format.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
         <source>Write depths of images to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export UDDF file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="267"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
         <source>Export CSV file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="278"/>
         <source>Export world map</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="299"/>
         <source>HTML files (*.html)</source>
         <translation>קבצי HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="283"/>
         <source>Export Subsurface XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="284"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
         <source>Save image depths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="298"/>
         <source>Export HTML files as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
         <source>Can&apos;t open file %s</source>
         <translation type="unfinished"/>
     </message>
@@ -1580,247 +1756,227 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
-        <source>CSV options</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
+        <source>Time</source>
+        <translation>זמן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="281"/>
-        <source>Pre-configured imports</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="97"/>
+        <source>Metric</source>
+        <translation>מידה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="122"/>
-        <source>Depth</source>
-        <translation>עומק</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="102"/>
+        <source>Imperial</source>
+        <translation>אמריקאית</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="142"/>
-        <source>Stopdepth</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="59"/>
+        <source>dd.mm.yyyy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="162"/>
-        <source>Pressure</source>
-        <translation>לחץ</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="176"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="466"/>
-        <source>Time</source>
-        <translation>זמן</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="183"/>
-        <source>Temp</source>
-        <translation>טמפ</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="213"/>
-        <source>NDL</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="64"/>
+        <source>mm/dd/yyyy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="233"/>
-        <source>TTS</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="69"/>
+        <source>yyyy-mm-dd</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="253"/>
-        <source>Cns</source>
-        <translation>רעילות שייורית מקסימלית</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="58"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="789"/>
-        <source>Field separator</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+        <source>Dive #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="35"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="363"/>
-        <source>Units</source>
-        <translation>יחידות</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+        <source>Date</source>
+        <translation>תאריך</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="42"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="370"/>
-        <source>Metric</source>
-        <translation>מידה</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+        <source>Duration</source>
+        <translation>משך הצלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="47"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="375"/>
-        <source>Imperial</source>
-        <translation>אמריקאית</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+        <source>GPS</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="169"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+        <source>Tags</source>
+        <translation>תגיות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="298"/>
-        <source>Manual dives</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+        <source>O₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="316"/>
-        <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+        <source>He</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="319"/>
-        <source>Date format</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="78"/>
+        <source>Seconds</source>
+        <translation>שניות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="332"/>
-        <source>dd.mm.yyyy</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
+        <source>Minutes</source>
+        <translation>דקות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="337"/>
-        <source>mm/dd/yyyy</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="88"/>
+        <source>Minutes:seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="342"/>
-        <source>yyyy-mm-dd</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+        <source>Location</source>
+        <translation>מיקום</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="392"/>
-        <source>Dive #</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+        <source>Max depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="426"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="439"/>
-        <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+        <source>Tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="429"/>
-        <source>Date</source>
-        <translation>תאריך</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="500"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="513"/>
-        <source>Dive duration in seconds or in min:sec format</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="503"/>
-        <source>Duration</source>
-        <translation>משך הצלילה</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="574"/>
-        <source>GPS</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+        <source>Sample time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="591"/>
-        <source>Tags</source>
-        <translation>תגיות</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="608"/>
-        <source>Cyl size</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+        <source>Sample temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="625"/>
-        <source>Air temp</source>
-        <translation>טמפ&apos; האוויר</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="642"/>
-        <source>Start Pressure</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+        <source>Sample cns</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="659"/>
-        <source>Water temp</source>
-        <translation>טמפ&apos; מים</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="676"/>
-        <source>End Press</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+        <source>Sample tts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="693"/>
-        <source>O₂</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+        <source>Sample stopdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="710"/>
-        <source>He</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+        <source>Samples pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="742"/>
-        <source>Choose duration format.</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+        <source>Sample pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="745"/>
-        <source>Duration format</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+        <source>Mean depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="758"/>
-        <source>Seconds</source>
-        <translation>שניות</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="763"/>
-        <source>Minutes</source>
-        <translation>דקות</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+        <source>Buddy</source>
+        <translation>בן זוג</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="768"/>
-        <source>Minutes:seconds</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+        <source>Notes</source>
+        <translation>הערות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="540"/>
-        <source>Location</source>
-        <translation>מיקום</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+        <source>Weight</source>
+        <translation>משקל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="409"/>
-        <source>Max depth</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+        <source>Cyl. size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="386"/>
-        <source>Field configuration</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+        <source>Start pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="449"/>
-        <source>Mean depth</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+        <source>End pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="483"/>
-        <source>Buddy</source>
-        <translation>בן זוג</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="523"/>
-        <source>Notes</source>
-        <translation>הערות</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="557"/>
-        <source>Weight</source>
-        <translation>משקל</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1864,42 +2020,42 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
         <source>unknown</source>
         <translation>לא ידוע</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="691"/>
         <source>Final depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="693"/>
         <source>Run time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="701"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="695"/>
         <source>Duration</source>
         <translation>משך הצלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="703"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
         <source>Used gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="705"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
         <source>CC set point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1044"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1051"/>
         <source>Discard the plan?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1045"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1052"/>
         <source>You are about to discard your plan.</source>
         <translation>אזהרה, אתם עומדים למחוק תוכנית צלילה.</translation>
     </message>
@@ -1907,22 +2063,22 @@
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="257"/>
         <source>Dive planner points</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="261"/>
         <source>Available gases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="284"/>
         <source>Add dive data point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="304"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="293"/>
         <source>Save new</source>
         <translation type="unfinished"/>
     </message>
@@ -1930,92 +2086,112 @@
 <context>
     <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Depth</source>
         <translation>עומק</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
         <source>Time</source>
         <translation>זמן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
         <source>Pressure</source>
         <translation>לחץ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>Temperature</source>
         <translation>טמפרטורה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
         <source>Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
         <source>Pressure S</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
         <source>pHe</source>
         <translation>לחץ הליום</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
+        <source>Setpoint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
+        <source>Sensor1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
+        <source>Sensor2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
+        <source>Sensor3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
         <source>Ambient pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
-        <source>Heart Beat</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
+        <source>Heart beat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
-        <source>Gradient Factor</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/>
+        <source>Gradient factor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
-        <source>Mean Depth/s</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
+        <source>Mean depth/s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
         <source>Pressure I</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
         <source>User entered</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
         <source>Cylinder index</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
         <source>Ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
         <source>SAC</source>
         <translation>צריכת אויר</translation>
     </message>
@@ -2066,127 +2242,127 @@
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1437"/>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1443"/>
+        <location filename="../qt-ui/models.cpp" line="1489"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1440"/>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1492"/>
         <source>Date</source>
         <translation>תאריך</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1443"/>
-        <location filename="../qt-ui/models.cpp" line="1489"/>
+        <location filename="../qt-ui/models.cpp" line="1449"/>
+        <location filename="../qt-ui/models.cpp" line="1495"/>
         <source>Rating</source>
         <translation>דירוג</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1452"/>
         <source>Depth</source>
         <translation>עומק</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1458"/>
         <source>Temp</source>
         <translation>טמפ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1461"/>
         <source>Weight</source>
         <translation>משקל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>SAC</source>
         <translation>צריכת אויר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>m</source>
         <translation>מטר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>ft</source>
         <translation>רגל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1458"/>
-        <location filename="../qt-ui/models.cpp" line="1504"/>
+        <location filename="../qt-ui/models.cpp" line="1464"/>
+        <location filename="../qt-ui/models.cpp" line="1510"/>
         <source>Suit</source>
         <translation>חליפה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1461"/>
-        <location filename="../qt-ui/models.cpp" line="1507"/>
+        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1513"/>
         <source>Cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1464"/>
-        <location filename="../qt-ui/models.cpp" line="1510"/>
+        <location filename="../qt-ui/models.cpp" line="1470"/>
+        <location filename="../qt-ui/models.cpp" line="1516"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>/min</source>
         <translation>לדקה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1473"/>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1527"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
-        <location filename="../qt-ui/models.cpp" line="1524"/>
+        <location filename="../qt-ui/models.cpp" line="1482"/>
+        <location filename="../qt-ui/models.cpp" line="1530"/>
         <source>Location</source>
         <translation>מיקום</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>kg</source>
         <translation>קילוגרם</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1449"/>
-        <location filename="../qt-ui/models.cpp" line="1495"/>
+        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1501"/>
         <source>Duration</source>
         <translation>משך הצלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1498"/>
+        <location filename="../qt-ui/models.cpp" line="1504"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>lbs</source>
         <translation>ליברה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1470"/>
-        <location filename="../qt-ui/models.cpp" line="1518"/>
+        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1524"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -2194,95 +2370,95 @@
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="98"/>
         <source>no dives were selected</source>
         <translation>שום צלילות נבחרו</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="117"/>
         <source>failed to create zip file for upload: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="143"/>
         <source>cannot create temporary file: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/>
         <source>internal error: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="169"/>
         <source>internal error</source>
         <translation>שגיאה פנימית</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="629"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="828"/>
         <source>Done</source>
         <translation>סיים</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/>
         <source>Uploading dive list...</source>
         <translation>העלאת רשימת צלילות...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="692"/>
         <source>Downloading dive list...</source>
         <translation>הורדת רשימת צלילות...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="741"/>
         <source>Downloading %1 dives...</source>
         <translation>הורדת 1% צלילות...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="785"/>
         <source>Download finished - %1</source>
         <translation>ההורדה הסתיימה - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="802"/>
         <source>Corrupted download</source>
         <translation>הורדה פגומה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>לא היה אפשרות לפתוח את הארכיון:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
         <source>Upload failed</source>
         <translation>ההעלאה נכשלה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/>
         <source>Upload successful</source>
         <translation>ההעלאה הסתיימה בהצלחה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
         <source>Login failed</source>
         <translation>שגיאת התחברות (הזדהות)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
         <source>Cannot parse response</source>
         <translation>תשובה לא ברורה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
         <source>Error: %1</source>
         <translation>שגיאה: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="829"/>
         <source>Upload finished</source>
         <translation>ההעלאה הסתיימה</translation>
     </message>
@@ -2290,54 +2466,52 @@
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
-        <source>OK</source>
-        <translation>אשר</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="169"/>
         <source>Error</source>
         <translation>שגיאה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="400"/>
         <source>Retry</source>
         <translation>נסה שוב</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="264"/>
         <source>Find Uemis dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Log files (*.log)</source>
         <translation>קבצי יומן (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="362"/>
         <source>Warning</source>
         <translation>אזהרה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="363"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="374"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="375"/>
         <source>Dump files (*.bin)</source>
         <translation>קבצי Dump (*.bin)</translation>
     </message>
@@ -2345,7 +2519,7 @@
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="101"/>
         <source>Vendor</source>
         <translation>יצרן</translation>
     </message>
@@ -2355,54 +2529,74 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="31"/>
         <source>Device or mount point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="111"/>
         <source>Dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="132"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="45"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="80"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="94"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="52"/>
         <source>Force download of all dives</source>
         <translation>משוך את כל הצלילות.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
         <source>Always prefer downloaded dives</source>
         <translation>תמיד העדף צלילות מורדות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
         <source>OK</source>
         <translation>אשר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="189"/>
         <source>Cancel</source>
         <translation>בטל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/>
+        <source>Downloaded Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
+        <source>Select all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
+        <source>Unselect all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
         <source>Save libdivecomputer logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="87"/>
         <source>Save libdivecomputer dumpfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
         <source>Download into new trip</source>
         <translation type="unfinished"/>
     </message>
@@ -2410,12 +2604,12 @@
 <context>
     <name>ExtraDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Value</source>
         <translation type="unfinished"/>
     </message>
@@ -2429,21 +2623,21 @@
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="245"/>
-        <source>Your dive profile was updated to facebook.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
-        <source>Photo Upload Failed</source>
+        <source>Your dive profile was updated to Facebook.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="250"/>
-        <source>Your dive profile was not updated to facebook, 
+        <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+        <source>Photo Upload Failed</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>FilterWidget</name>
@@ -2484,17 +2678,17 @@
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1544"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1621"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1624"/>
         <source>Firmware update failed!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1550"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1627"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -2502,7 +2696,7 @@
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="128"/>
+        <location filename="../qt-ui/globe.cpp" line="119"/>
         <source>Edit selected dive locations</source>
         <translation type="unfinished"/>
     </message>
@@ -2510,7 +2704,7 @@
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="566"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="549"/>
         <source>Location: </source>
         <translation type="unfinished"/>
     </message>
@@ -2518,7 +2712,7 @@
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="286"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="283"/>
         <source>No location set</source>
         <translation type="unfinished"/>
     </message>
@@ -2526,347 +2720,352 @@
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="133"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
+        <location filename="../qt-ui/maintab.cpp" line="497"/>
         <source>Location</source>
         <translation>מיקום</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="67"/>
         <source>Coordinates</source>
         <translation>קואורדינטות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="169"/>
         <source>Divemaster</source>
         <translation>מדריך צלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="154"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Buddy</source>
         <translation>בן זוג</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="222"/>
+        <location filename="../qt-ui/maintab.ui" line="277"/>
         <source>Tags</source>
         <translation>תגיות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="186"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
         <source>Rating</source>
         <translation>דירוג</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="221"/>
         <source>Visibility</source>
         <translation>ראות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="230"/>
         <source>Suit</source>
         <translation>חליפה</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="465"/>
+        <location filename="../qt-ui/maintab.cpp" line="470"/>
         <source>Dive notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
-        <location filename="../qt-ui/maintab.ui" line="648"/>
-        <location filename="../qt-ui/maintab.cpp" line="277"/>
+        <location filename="../qt-ui/maintab.ui" line="74"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="102"/>
+        <location filename="../qt-ui/maintab.ui" line="677"/>
+        <location filename="../qt-ui/maintab.cpp" line="279"/>
         <source>Air temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <location filename="../qt-ui/maintab.ui" line="667"/>
-        <location filename="../qt-ui/maintab.cpp" line="278"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.ui" line="696"/>
+        <location filename="../qt-ui/maintab.cpp" line="280"/>
         <source>Water temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="229"/>
-        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.ui" line="284"/>
+        <location filename="../qt-ui/maintab.cpp" line="498"/>
         <source>Notes</source>
         <translation>הערות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="369"/>
+        <location filename="../qt-ui/maintab.ui" line="398"/>
         <source>Equipment</source>
         <translation>ציוד</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="496"/>
+        <location filename="../qt-ui/maintab.ui" line="525"/>
         <source>Gases used</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="515"/>
+        <location filename="../qt-ui/maintab.ui" line="544"/>
         <source>Gas consumed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="553"/>
+        <location filename="../qt-ui/maintab.ui" line="582"/>
         <source>CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="591"/>
+        <location filename="../qt-ui/maintab.ui" line="620"/>
         <source>Max. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="629"/>
+        <location filename="../qt-ui/maintab.ui" line="658"/>
         <source>Air pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="686"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>Dive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="845"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
         <source>Total time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="903"/>
+        <location filename="../qt-ui/maintab.ui" line="932"/>
         <source>Gas consumption</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="962"/>
+        <location filename="../qt-ui/maintab.ui" line="991"/>
         <source>Extra data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="968"/>
+        <location filename="../qt-ui/maintab.ui" line="997"/>
         <source>Additional data from dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="54"/>
-        <location filename="../qt-ui/maintab.ui" line="458"/>
+        <location filename="../qt-ui/maintab.ui" line="83"/>
+        <location filename="../qt-ui/maintab.ui" line="487"/>
         <source>Date</source>
         <translation>תאריך</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="61"/>
+        <location filename="../qt-ui/maintab.ui" line="90"/>
         <source>Time</source>
         <translation>זמן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="425"/>
+        <location filename="../qt-ui/maintab.ui" line="454"/>
         <source>Dive info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="477"/>
+        <location filename="../qt-ui/maintab.ui" line="506"/>
         <source>Interval</source>
         <translation>משך</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="534"/>
-        <location filename="../qt-ui/maintab.ui" line="799"/>
+        <location filename="../qt-ui/maintab.ui" line="563"/>
+        <location filename="../qt-ui/maintab.ui" line="828"/>
         <source>SAC</source>
         <translation>צריכת אויר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="610"/>
+        <location filename="../qt-ui/maintab.ui" line="639"/>
         <source>Avg. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="572"/>
+        <location filename="../qt-ui/maintab.ui" line="601"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="734"/>
         <source>Salinity</source>
         <translation>מליחות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="742"/>
+        <location filename="../qt-ui/maintab.ui" line="771"/>
         <source>Stats</source>
         <translation>סטטסטיקות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="775"/>
+        <location filename="../qt-ui/maintab.ui" line="804"/>
         <source>Depth</source>
         <translation>עומק</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="787"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Temperature</source>
         <translation>טמפרטורה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="813"/>
+        <location filename="../qt-ui/maintab.ui" line="842"/>
         <source>Duration</source>
         <translation>משך הצלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="864"/>
+        <location filename="../qt-ui/maintab.ui" line="893"/>
         <source>Dives</source>
         <translation>צלילות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="948"/>
+        <location filename="../qt-ui/maintab.ui" line="977"/>
         <source>Photos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="95"/>
+        <location filename="../qt-ui/maintab.cpp" line="87"/>
         <source>Cylinders</source>
         <translation>מיכלים</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="99"/>
+        <location filename="../qt-ui/maintab.cpp" line="91"/>
         <source>Weights</source>
         <translation>משקולות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="55"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Apply changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="59"/>
+        <location filename="../qt-ui/maintab.cpp" line="50"/>
         <source>Discard changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="96"/>
+        <location filename="../qt-ui/maintab.cpp" line="88"/>
         <source>Add cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="100"/>
+        <location filename="../qt-ui/maintab.cpp" line="92"/>
         <source>Add weight system</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="274"/>
+        <location filename="../qt-ui/maintab.cpp" line="276"/>
         <source>Air temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="275"/>
+        <location filename="../qt-ui/maintab.cpp" line="277"/>
         <source>Water temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="312"/>
+        <location filename="../qt-ui/maintab.cpp" line="314"/>
         <source>This trip is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="320"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Multiple dives are being edited.</source>
         <translation>צלילות מרובות בעריכה.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.cpp" line="324"/>
         <source>This dive is being edited.</source>
         <translation>צלילה זו בעריכה.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="436"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
+        <location filename="../qt-ui/maintab.cpp" line="465"/>
         <source>Trip notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="458"/>
+        <location filename="../qt-ui/maintab.cpp" line="463"/>
         <source>Trip location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="526"/>
-        <location filename="../qt-ui/maintab.cpp" line="558"/>
-        <location filename="../qt-ui/maintab.cpp" line="562"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
         <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="574"/>
         <source>/min</source>
         <translation>לדקה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="555"/>
+        <location filename="../qt-ui/maintab.cpp" line="563"/>
         <source>Deepest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="556"/>
+        <location filename="../qt-ui/maintab.cpp" line="564"/>
         <source>Shallowest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="569"/>
+        <location filename="../qt-ui/maintab.cpp" line="577"/>
         <source>Highest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="578"/>
         <source>Lowest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="571"/>
+        <location filename="../qt-ui/maintab.cpp" line="579"/>
         <source>Average total SAC of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="582"/>
+        <location filename="../qt-ui/maintab.cpp" line="590"/>
         <source>Highest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="583"/>
+        <location filename="../qt-ui/maintab.cpp" line="591"/>
         <source>Lowest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="584"/>
+        <location filename="../qt-ui/maintab.cpp" line="592"/>
         <source>Average temperature of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="594"/>
+        <location filename="../qt-ui/maintab.cpp" line="602"/>
         <source>Longest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="595"/>
+        <location filename="../qt-ui/maintab.cpp" line="603"/>
         <source>Shortest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="596"/>
+        <location filename="../qt-ui/maintab.cpp" line="604"/>
         <source>Average length of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="620"/>
+        <location filename="../qt-ui/maintab.cpp" line="628"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="624"/>
+        <location filename="../qt-ui/maintab.cpp" line="632"/>
         <source> and </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="911"/>
+        <location filename="../qt-ui/maintab.cpp" line="925"/>
         <source>Discard the changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="912"/>
+        <location filename="../qt-ui/maintab.cpp" line="926"/>
         <source>You are about to discard your changes.</source>
         <translation type="unfinished"/>
     </message>
@@ -3009,7 +3208,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="296"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="232"/>
         <source>Open</source>
         <translation>פתח</translation>
     </message>
@@ -3369,90 +3568,90 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="252"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="229"/>
         <source>Open file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="256"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="233"/>
         <source>Cancel</source>
         <translation>בטל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="332"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="309"/>
         <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="444"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
         <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="491"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
         <source>Print runtime table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="834"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="811"/>
         <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="836"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="813"/>
         <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="841"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="818"/>
         <source>Save changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1196"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1173"/>
         <source>Save file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1337"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1314"/>
         <source>Open dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="819"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>כל השינויים יאבדו אם לא תשמרו אותם.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="300"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="444"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="277"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Warning</source>
         <translation>אזהרה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1180"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1157"/>
         <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="625"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="602"/>
         <source>Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1197"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1174"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>קבצי XML  נתמכים (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1338"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1315"/>
         <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"/>
     </message>
@@ -3460,7 +3659,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="651"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="634"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation type="unfinished"/>
     </message>
@@ -3468,39 +3667,39 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="239"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="243"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="244"/>
         <source>Not now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="245"/>
         <source>Update firmware</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
         <source>Firmware upgrade notice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
         <source>Save the downloaded firmware as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
         <source>HEX files (*.hex)</source>
         <translation type="unfinished"/>
     </message>
@@ -3508,54 +3707,69 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Open circuit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>ft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="481"/>
         <source>Last stop at 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="482"/>
         <source>50% avg. depth to 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="489"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
         <source>20ft to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="485"/>
         <source>m/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
         <source>Last stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
         <source>50% avg. depth to 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="494"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
         <source>6m to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="497"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="498"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
         <source>cuft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="506"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="507"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="500"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="501"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
@@ -3674,6 +3888,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="816"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -3708,57 +3923,87 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>קילוגרם</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="795"/>
+        <source>CCR: Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="809"/>
+        <source>Default CCR set-point for dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="832"/>
+        <source>pSCR O₂ metabolism rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="839"/>
+        <source>pSCR ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="846"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="859"/>
+        <source>1:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="875"/>
         <source>System default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="843"/>
+        <location filename="../qt-ui/preferences.ui" line="914"/>
         <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="849"/>
+        <location filename="../qt-ui/preferences.ui" line="920"/>
         <source>Proxy type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="862"/>
+        <location filename="../qt-ui/preferences.ui" line="933"/>
         <source>Host</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="888"/>
+        <location filename="../qt-ui/preferences.ui" line="959"/>
         <source>Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="914"/>
+        <location filename="../qt-ui/preferences.ui" line="985"/>
         <source>Requires authentication</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="934"/>
+        <location filename="../qt-ui/preferences.ui" line="1005"/>
         <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="957"/>
+        <location filename="../qt-ui/preferences.ui" line="1028"/>
         <source>Password</source>
         <translation>סיסמא</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="985"/>
-        <source>about:blank</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="1011"/>
-        <source>Disconnect from facebook</source>
+        <location filename="../qt-ui/preferences.ui" line="1079"/>
+        <source>Disconnect from Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="824"/>
+        <location filename="../qt-ui/preferences.ui" line="895"/>
         <source>Filter</source>
         <translation>פילטר</translation>
     </message>
@@ -3913,52 +4158,52 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>גרדיאנט עליון</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="28"/>
+        <location filename="../qt-ui/preferences.cpp" line="44"/>
         <source>No proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="29"/>
+        <location filename="../qt-ui/preferences.cpp" line="45"/>
         <source>System proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="30"/>
+        <location filename="../qt-ui/preferences.cpp" line="46"/>
         <source>HTTP proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="31"/>
+        <location filename="../qt-ui/preferences.cpp" line="47"/>
         <source>SOCKS proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="291"/>
+        <location filename="../qt-ui/preferences.cpp" line="324"/>
         <source>Restart required</source>
         <translation>נדרשת הפעלה מחדש</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="292"/>
+        <location filename="../qt-ui/preferences.cpp" line="325"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>כדי לטעון שפה חדשה בצורה נכונה עליך להפעיל מחדש את Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="456"/>
+        <location filename="../qt-ui/preferences.cpp" line="494"/>
         <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>קבצי XML  נתמכים (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Open default log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="455"/>
+        <location filename="../qt-ui/preferences.cpp" line="493"/>
         <source>Warning</source>
         <translation>אזהרה</translation>
     </message>
@@ -3966,17 +4211,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="91"/>
+        <location filename="../qt-ui/printdialog.cpp" line="85"/>
         <source>&amp;Preview</source>
         <translation>&amp;תצוגה מקדימה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="88"/>
+        <location filename="../qt-ui/printdialog.cpp" line="82"/>
         <source>P&amp;rint</source>
         <translation>ה&amp;דפס</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="103"/>
+        <location filename="../qt-ui/printdialog.cpp" line="97"/>
         <source>Print</source>
         <translation>הדפס</translation>
     </message>
@@ -3984,42 +4229,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="20"/>
         <source>Dive#</source>
         <translation>מספר צלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="21"/>
         <source>Date</source>
         <translation>תאריך</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="22"/>
         <source>Depth</source>
         <translation>עומק</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="23"/>
         <source>Duration</source>
         <translation>משך הצלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Master</source>
         <translation>מדריך</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Buddy</source>
         <translation>בן זוג</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="34"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Location</source>
         <translation>מיקום</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <location filename="../qt-ui/printlayout.cpp" line="63"/>
         <source>Subsurface cannot find a usable printer on this system!</source>
         <translation type="unfinished"/>
     </message>
@@ -4085,72 +4330,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2095"/>
+        <location filename="../qt-ui/models.cpp" line="2101"/>
         <source>unknown</source>
         <translation>לא ידוע</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2100"/>
+        <location filename="../qt-ui/models.cpp" line="2106"/>
         <source>Dive #%1 - %2</source>
         <translation>צלילות מס %1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2103"/>
+        <location filename="../qt-ui/models.cpp" line="2109"/>
         <source>Max depth: %1 %2</source>
         <translation>עומק מקסימלי: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2110"/>
+        <location filename="../qt-ui/models.cpp" line="2116"/>
         <source>Duration: %1 min</source>
         <translation>זמן: %1 דקות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2115"/>
+        <location filename="../qt-ui/models.cpp" line="2121"/>
         <source>Gas used:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2117"/>
+        <location filename="../qt-ui/models.cpp" line="2123"/>
         <source>Tags:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2119"/>
+        <location filename="../qt-ui/models.cpp" line="2125"/>
         <source>SAC:</source>
         <translation>צריכת אויר:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2121"/>
+        <location filename="../qt-ui/models.cpp" line="2127"/>
         <source>Weights:</source>
         <translation>משקולות:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2126"/>
+        <location filename="../qt-ui/models.cpp" line="2132"/>
         <source>Notes:</source>
         <translation>הערות:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2133"/>
+        <location filename="../qt-ui/models.cpp" line="2139"/>
         <source>Divemaster:</source>
         <translation>מדריך צלילה:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2135"/>
+        <location filename="../qt-ui/models.cpp" line="2141"/>
         <source>Buddy:</source>
         <translation>בן זוג:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2137"/>
+        <location filename="../qt-ui/models.cpp" line="2143"/>
         <source>Suit:</source>
         <translation>חליפה:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2139"/>
+        <location filename="../qt-ui/models.cpp" line="2145"/>
         <source>Viz:</source>
         <translation>ראות:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2141"/>
+        <location filename="../qt-ui/models.cpp" line="2147"/>
         <source>Rating:</source>
         <translation>דירוג</translation>
     </message>
@@ -4158,103 +4403,108 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="628"/>
         <source> (#%1 of %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="630"/>
+        <source>Unknown dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="647"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1168"/>
         <source>Make first divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Delete this divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1184"/>
         <source>Add gas change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1187"/>
         <source> (Tank %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1195"/>
         <source>Add set-point change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1197"/>
         <source>Add bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
         <source>Remove event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1206"/>
         <source>Hide similar events</source>
         <translation>הסתר אירועים דומים</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1213"/>
         <source>Edit name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1242"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1249"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1264"/>
         <source>Unhide all events</source>
         <translation>חשוף את כל האירועים</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide events</source>
         <translation>הסתר אירועים</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide all %1 events?</source>
         <translation>הסתר את כל %1 האירועים</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1333"/>
         <source>Remove the selected event?</source>
         <translation>הסר את האירוע שנבחרו?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1334"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1424"/>
         <source>Edit name of bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
         <source>Custom name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1430"/>
         <source>Name is too long!</source>
         <translation type="unfinished"/>
     </message>
@@ -4262,102 +4512,102 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>AIR</source>
         <translation>אוויר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>OXYGEN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="208"/>
         <source>Remove this point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="57"/>
         <source>Close</source>
         <translation>סגור</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="42"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="25"/>
         <source>Average</source>
         <translation>ממוצע</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="45"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="28"/>
         <source>Minimum</source>
         <translation>מינימום</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="48"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="31"/>
         <source>Maximum</source>
         <translation>מקסימום</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="297"/>
+        <location filename="../qt-ui/globe.cpp" line="296"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>תזיז את המפה ולחץ לחיצה כפולה כדי לקבוע את מיקום הצלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="525"/>
         <source>kg</source>
         <translation>קילוגרם</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="526"/>
         <source>lbs</source>
         <translation>ליברה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="550"/>
         <source>ft</source>
         <translation>רגל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="551"/>
         <source>m</source>
         <translation>מטר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="570"/>
+        <location filename="../qt-ui/models.cpp" line="574"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="571"/>
+        <location filename="../qt-ui/models.cpp" line="575"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="595"/>
+        <location filename="../qt-ui/models.cpp" line="599"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="596"/>
+        <location filename="../qt-ui/models.cpp" line="600"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="513"/>
         <source>Invalid response from server</source>
         <translation>תגובה לא חוקית מהשרת</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="567"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation>תג XML הצפוי &apos;DiveDates&apos; לא נמצא</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>תגובת XML פגומה. שורה %1: %2</translation>
     </message>
@@ -4365,12 +4615,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1450"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1518"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1442"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -4384,12 +4634,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
-        <location filename="../qt-ui/simplewidgets.cpp" line="151"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="134"/>
         <source>New starting number</source>
         <translation>מספר התחלתי חדש</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="149"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="132"/>
         <source>New number</source>
         <translation type="unfinished"/>
     </message>
@@ -4397,12 +4647,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1575"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1653"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1579"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1657"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -4481,12 +4731,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>איזה תאריך ושעה מוצגים בתמונה?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="276"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="259"/>
         <source>Open image file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="278"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="261"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation type="unfinished"/>
     </message>
@@ -4539,7 +4789,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <name>SocialNetworkDialog</name>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="282"/>
-        <source>Dive Date: %1 
+        <source>Dive date: %1 
 </source>
         <translation type="unfinished"/>
     </message>
@@ -4563,7 +4813,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="290"/>
-        <source>Dive Location: %1 
+        <source>Dive location: %1 
 </source>
         <translation type="unfinished"/>
     </message>
@@ -4680,47 +4930,47 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="329"/>
         <source>Webservice</source>
         <translation>שרות איטרנט</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="393"/>
         <source>Connecting...</source>
         <translation>מתחבר...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
         <source>Download finished</source>
         <translation>ההורדה הסתיימה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Download error: %1</source>
         <translation>שגיאת הורדה: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="436"/>
         <source>Connection error: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
         <source>Download successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="439"/>
         <source>Invalid user identifier!</source>
         <translation>שם משתמש לא חוקי!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="312"/>
         <source>Enter User ID and click Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="442"/>
         <source>Cannot parse response!</source>
         <translation>תשובה לא מובנת!</translation>
     </message>
@@ -4728,7 +4978,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="592"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="575"/>
         <source>Suits: </source>
         <translation type="unfinished"/>
     </message>
@@ -4736,7 +4986,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="119"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="116"/>
         <source>No suit set</source>
         <translation type="unfinished"/>
     </message>
@@ -4753,7 +5003,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="513"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="496"/>
         <source>Tags: </source>
         <translation type="unfinished"/>
     </message>
@@ -4761,7 +5011,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="144"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="141"/>
         <source>Empty tags</source>
         <translation type="unfinished"/>
     </message>
@@ -4769,17 +5019,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>Description</source>
         <translation>תיאור</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>ml</source>
         <translation>מ&quot;ל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -4787,7 +5037,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="141"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="131"/>
         <source>Information</source>
         <translation>מידע נוסף</translation>
     </message>
@@ -4795,7 +5045,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1090"/>
+        <location filename="../qt-ui/models.cpp" line="1094"/>
         <source> (%1 shown)</source>
         <translation type="unfinished"/>
     </message>
@@ -4803,72 +5053,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="64"/>
         <source>Check for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="66"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="70"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="72"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
         <source>Please check your internet connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="85"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="84"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="88"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="95"/>
         <source>A new version of Subsurface is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="97"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
         <source>Latest version is %1, please check with your OS vendor for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="103"/>
         <source>Newest release version is </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="105"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
         <source>The server returned the following information:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="121"/>
         <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
         <source>Decline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="124"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
         <source>Accept</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="126"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="125"/>
         <source>Automatic check for updates</source>
         <translation type="unfinished"/>
     </message>
@@ -4876,13 +5126,13 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UserManual</name>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="55"/>
+        <location filename="../qt-ui/usermanual.cpp" line="54"/>
         <source>User Manual</source>
         <translation>מדריך משתמש</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="72"/>
-        <location filename="../qt-ui/usermanual.cpp" line="78"/>
+        <location filename="../qt-ui/usermanual.cpp" line="71"/>
+        <location filename="../qt-ui/usermanual.cpp" line="77"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>קובץ המדריך למשתמש לא נמצא</translation>
     </message>
@@ -4960,81 +5210,81 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
         <source>
 Operating System: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
         <source>
 CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 Language: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="93"/>
         <source>Should we ask you later?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Don&apos;t ask me again</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Ask later</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
         <source>Submit user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask again?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="17"/>
         <source>Send</source>
         <translation>שלח</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="121"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>Please check your internet connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="131"/>
         <source>Survey successfully submitted.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="136"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation type="unfinished"/>
     </message>
@@ -5042,12 +5292,12 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>Description</source>
         <translation>תיאור</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>kg</source>
         <translation>קילוגרם</translation>
     </message>
@@ -5095,12 +5345,12 @@ OS CPU Architecture: %1</source>
         <translation>ההעלאה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="247"/>
         <source>Operation timed out</source>
         <translation>הפעולה נכשלה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="268"/>
         <source>Transferring data...</source>
         <translation type="unfinished"/>
     </message>
@@ -5108,17 +5358,17 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Type</source>
         <translation>סוג</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Weight</source>
         <translation>משקל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="496"/>
+        <location filename="../qt-ui/models.cpp" line="500"/>
         <source>Clicking here will remove this weight system.</source>
         <translation type="unfinished"/>
     </message>
@@ -5126,19 +5376,19 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1479"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1487"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1497"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1555"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1566"/>
         <source>Failed!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1506"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1576"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1580"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -5146,79 +5396,79 @@ OS CPU Architecture: %1</source>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1841"/>
+        <location filename="../qt-ui/models.cpp" line="1847"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>שנה
 &gt; חודש / טיול</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1844"/>
+        <location filename="../qt-ui/models.cpp" line="1850"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1847"/>
+        <location filename="../qt-ui/models.cpp" line="1853"/>
         <source>Duration 
  Total</source>
         <translation>משך
 כולל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1850"/>
+        <location filename="../qt-ui/models.cpp" line="1856"/>
         <source>
 Average</source>
         <translation>
 ממוצע</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1853"/>
+        <location filename="../qt-ui/models.cpp" line="1859"/>
         <source>
 Shortest</source>
         <translation>
 קצר ביותר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1856"/>
+        <location filename="../qt-ui/models.cpp" line="1862"/>
         <source>
 Longest</source>
         <translation>
 ארוך ביותר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1859"/>
+        <location filename="../qt-ui/models.cpp" line="1865"/>
         <source>Depth (%1)
  Average</source>
         <translation>עומק (%1)
 ממוצע</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1862"/>
-        <location filename="../qt-ui/models.cpp" line="1871"/>
-        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>
 Minimum</source>
         <translation>
 מינימום</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1865"/>
-        <location filename="../qt-ui/models.cpp" line="1874"/>
-        <location filename="../qt-ui/models.cpp" line="1883"/>
+        <location filename="../qt-ui/models.cpp" line="1871"/>
+        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>
 Maximum</source>
         <translation>
 מקסימום</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1874"/>
         <source>SAC (%1)
  Average</source>
         <translation>צריכת אויר (%1)
 ממוצע</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1883"/>
         <source>Temp. (%1)
  Average</source>
         <translation>טמפ&apos; (%1)
@@ -5299,40 +5549,40 @@ Maximum</source>
         <translation>קילוגרם</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1508"/>
+        <location filename="../dive.c" line="1530"/>
         <source>(%s) or (%s)</source>
         <translation>(%S) או (%S)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="464"/>
+        <location filename="../divelist.c" line="467"/>
         <location filename="../equipment.c" line="81"/>
-        <location filename="../planner.c" line="1060"/>
-        <location filename="../planner.c" line="1063"/>
+        <location filename="../planner.c" line="1081"/>
+        <location filename="../planner.c" line="1084"/>
         <source>air</source>
         <translation>אוויר</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="192"/>
+        <location filename="../equipment.c" line="194"/>
         <source>integrated</source>
         <translation>איטגרל</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="193"/>
+        <location filename="../equipment.c" line="195"/>
         <source>belt</source>
         <translation>חגורה</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="194"/>
+        <location filename="../equipment.c" line="196"/>
         <source>ankle</source>
         <translation>קרסול</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="195"/>
+        <location filename="../equipment.c" line="197"/>
         <source>backplate weight</source>
         <translation>משקל פלטת גב</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="196"/>
+        <location filename="../equipment.c" line="198"/>
         <source>clip-on</source>
         <translation>נצמד</translation>
     </message>
@@ -5340,7 +5590,7 @@ Maximum</source>
         <location filename="../file.c" line="112"/>
         <location filename="../file.c" line="434"/>
         <location filename="../file.c" line="506"/>
-        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="925"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>קריאה מ&apos;%S&apos; נכשלה</translation>
     </message>
@@ -5397,9 +5647,9 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../file.c" line="869"/>
-        <location filename="../file.c" line="909"/>
-        <location filename="../file.c" line="1007"/>
+        <location filename="../file.c" line="870"/>
+        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="1016"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation type="unfinished"/>
     </message>
@@ -5570,27 +5820,27 @@ Maximum</source>
         <translation>מס&apos; ארוע שגוי</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="421"/>
+        <location filename="../libdivecomputer.c" line="419"/>
         <source>Unable to create parser for %s %s</source>
         <translation>לא מצליח להבין %s %s </translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="427"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Error registering the data</source>
         <translation>שגיאה ברישום המידע</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="433"/>
         <source>Error parsing the datetime</source>
         <translation>שגיאה בקריאת תאריך</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Dive %d: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="455"/>
+        <location filename="../libdivecomputer.c" line="454"/>
         <source>Error parsing the divetime</source>
         <translation>שגיאה בקריאת זמן צלילה</translation>
     </message>
@@ -5600,155 +5850,155 @@ Maximum</source>
         <translation>שגיאה בקריאת עומק מקסימלי</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="482"/>
+        <location filename="../libdivecomputer.c" line="483"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="501"/>
+        <location filename="../libdivecomputer.c" line="503"/>
         <source>Error parsing the gas mix count</source>
         <translation>שגיאה בקריאת תערובת גזים</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="513"/>
+        <location filename="../libdivecomputer.c" line="515"/>
         <source>Error obtaining water salinity</source>
         <translation>שגיאה בקבלת מליחות מים</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="521"/>
+        <location filename="../libdivecomputer.c" line="524"/>
         <source>Error obtaining surface pressure</source>
         <translation>שגיאה בקבלת לחץ על פני המים</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="545"/>
+        <location filename="../libdivecomputer.c" line="549"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="562"/>
+        <location filename="../libdivecomputer.c" line="569"/>
         <source>Error parsing the gas mix</source>
         <translation>שגיאה בקריאת תערובת הגזים</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="569"/>
+        <location filename="../libdivecomputer.c" line="576"/>
         <source>Error parsing the samples</source>
         <translation>שגיאה בקריאת נקודות דגימה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="706"/>
+        <location filename="../libdivecomputer.c" line="713"/>
         <source>Event: waiting for user action</source>
         <translation>אירוע: מחכה לפעולה של המשתמש</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="714"/>
+        <location filename="../libdivecomputer.c" line="721"/>
         <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="778"/>
+        <location filename="../libdivecomputer.c" line="785"/>
         <source>Error registering the event handler.</source>
         <translation>שגיאה ברישום שגרת ניהול</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="783"/>
+        <location filename="../libdivecomputer.c" line="790"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="804"/>
+        <location filename="../libdivecomputer.c" line="811"/>
         <source>Dive data import error</source>
         <translation>שגיאת יבוא נתוני צלילה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="843"/>
+        <location filename="../libdivecomputer.c" line="850"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="850"/>
+        <location filename="../libdivecomputer.c" line="857"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>לא ניתן לפתוח את %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="858"/>
+        <location filename="../libdivecomputer.c" line="865"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="506"/>
+        <location filename="../parse-xml.c" line="516"/>
         <source>Strange percentage reading %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1760"/>
+        <location filename="../parse-xml.c" line="1770"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1989"/>
-        <location filename="../parse-xml.c" line="2137"/>
+        <location filename="../parse-xml.c" line="1999"/>
+        <location filename="../parse-xml.c" line="2147"/>
         <source>Database query dm4_events failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1996"/>
-        <location filename="../parse-xml.c" line="2144"/>
+        <location filename="../parse-xml.c" line="2006"/>
+        <location filename="../parse-xml.c" line="2154"/>
         <source>Database query dm4_tags failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2318"/>
+        <location filename="../parse-xml.c" line="2328"/>
         <source>Database query shearwater_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2325"/>
+        <location filename="../parse-xml.c" line="2335"/>
         <source>Database query shearwater_changes failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2332"/>
+        <location filename="../parse-xml.c" line="2342"/>
         <source>Database query shearwater_profile_sample failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2451"/>
+        <location filename="../parse-xml.c" line="2461"/>
         <source>Database query cobalt_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2458"/>
+        <location filename="../parse-xml.c" line="2468"/>
         <source>Database query cobalt_buddies failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2465"/>
+        <location filename="../parse-xml.c" line="2475"/>
         <source>Database query cobalt_visibility failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2472"/>
+        <location filename="../parse-xml.c" line="2482"/>
         <source>Database query cobalt_location failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2479"/>
+        <location filename="../parse-xml.c" line="2489"/>
         <source>Database query cobalt_location (site) failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2486"/>
+        <location filename="../parse-xml.c" line="2496"/>
         <source>Database query cobalt_profile_sample failed.
 </source>
         <translation type="unfinished"/>
@@ -5761,17 +6011,17 @@ Maximum</source>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2168"/>
-        <location filename="../parse-xml.c" line="2189"/>
-        <location filename="../parse-xml.c" line="2508"/>
-        <location filename="../parse-xml.c" line="2527"/>
+        <location filename="../parse-xml.c" line="2178"/>
+        <location filename="../parse-xml.c" line="2199"/>
+        <location filename="../parse-xml.c" line="2518"/>
+        <location filename="../parse-xml.c" line="2537"/>
         <source>Database query failed '%s'.
 </source>
         <translation>שאילתת מסד נתונים נכשל &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2848"/>
+        <location filename="../parse-xml.c" line="2909"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>לא ניתן לפתוח את גיליון העיצוב %s</translation>
     </message>
@@ -5781,363 +6031,369 @@ Maximum</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="820"/>
+        <location filename="../planner.c" line="841"/>
         <source>Can&apos;t find gas %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="356"/>
+        <location filename="../planner.c" line="363"/>
         <source>Too many gas mixes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="540"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="548"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="544"/>
+        <location filename="../planner.c" line="551"/>
         <source>Subsurface dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="548"/>
+        <location filename="../planner.c" line="555"/>
         <source>depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="558"/>
         <source>runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="554"/>
+        <location filename="../planner.c" line="561"/>
         <source>duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="557"/>
+        <location filename="../planner.c" line="564"/>
         <source>gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="594"/>
+        <location filename="../planner.c" line="601"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="602"/>
+        <location filename="../planner.c" line="609"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="615"/>
+        <location filename="../planner.c" line="622"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="622"/>
+        <location filename="../planner.c" line="629"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="635"/>
+        <location filename="../planner.c" line="642"/>
         <source>%3.0f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="638"/>
-        <location filename="../planner.c" line="642"/>
+        <location filename="../planner.c" line="645"/>
+        <location filename="../planner.c" line="649"/>
         <source>%3dmin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="651"/>
+        <location filename="../planner.c" line="658"/>
         <source>(SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="676"/>
+        <location filename="../planner.c" line="683"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="678"/>
+        <location filename="../planner.c" line="685"/>
         <source>Switch gas to %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="697"/>
+        <location filename="../planner.c" line="704"/>
         <source>CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="699"/>
+        <location filename="../planner.c" line="706"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="710"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="705"/>
+        <location filename="../planner.c" line="712"/>
         <source>Gas consumption:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="535"/>
-        <location filename="../planner.c" line="725"/>
-        <location filename="../planner.c" line="730"/>
-        <location filename="../planner.c" line="753"/>
+        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="732"/>
+        <location filename="../planner.c" line="737"/>
+        <location filename="../planner.c" line="762"/>
+        <location filename="../planner.c" line="772"/>
         <source>Warning:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="523"/>
+        <location filename="../planner.c" line="530"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="726"/>
+        <location filename="../planner.c" line="733"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="731"/>
+        <location filename="../planner.c" line="738"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="733"/>
+        <location filename="../planner.c" line="740"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="735"/>
+        <location filename="../planner.c" line="742"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="759"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="1064"/>
+        <location filename="../planner.c" line="769"/>
+        <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="1085"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1099"/>
+        <location filename="../profile.c" line="1113"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1102"/>
+        <location filename="../profile.c" line="1116"/>
         <source>P: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1106"/>
+        <location filename="../profile.c" line="1120"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1112"/>
+        <location filename="../profile.c" line="1126"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1115"/>
+        <location filename="../profile.c" line="1129"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1117"/>
+        <location filename="../profile.c" line="1131"/>
         <source>CNS: %u%%
 </source>
         <translation>רעילות שייורית מקסימלית %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1119"/>
+        <location filename="../profile.c" line="1133"/>
         <source>pO%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1121"/>
+        <location filename="../profile.c" line="1135"/>
         <source>pN%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1123"/>
+        <location filename="../profile.c" line="1137"/>
         <source>pHe: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1140"/>
         <source>MOD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1147"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1137"/>
+        <location filename="../profile.c" line="1151"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1149"/>
+        <location filename="../profile.c" line="1163"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1152"/>
+        <location filename="../profile.c" line="1166"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1157"/>
+        <location filename="../profile.c" line="1171"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1174"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1178"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1166"/>
+        <location filename="../profile.c" line="1180"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1183"/>
         <source>TTS: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1172"/>
+        <location filename="../profile.c" line="1186"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1180"/>
+        <location filename="../profile.c" line="1194"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1196"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1185"/>
+        <location filename="../profile.c" line="1199"/>
         <source>TTS: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1188"/>
+        <location filename="../profile.c" line="1202"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1194"/>
+        <location filename="../profile.c" line="1208"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1214"/>
         <source>heartbeat: %d
 </source>
         <translation>פעימות לב %d</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1202"/>
+        <location filename="../profile.c" line="1216"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1205"/>
+        <location filename="../profile.c" line="1219"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1314"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1304"/>
-        <location filename="../profile.c" line="1308"/>
-        <location filename="../profile.c" line="1312"/>
+        <location filename="../profile.c" line="1318"/>
+        <location filename="../profile.c" line="1322"/>
+        <location filename="../profile.c" line="1326"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1316"/>
+        <location filename="../profile.c" line="1330"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1334"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1324"/>
-        <location filename="../profile.c" line="1328"/>
+        <location filename="../profile.c" line="1338"/>
+        <location filename="../profile.c" line="1342"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1335"/>
+        <location filename="../profile.c" line="1349"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -6268,6 +6524,7 @@ EADD: %d%s
     </message>
     <message>
         <location filename="../dive.c" line="30"/>
+        <location filename="../equipment.c" line="85"/>
         <source>oxygen</source>
         <translation type="unfinished"/>
     </message>
@@ -6322,97 +6579,97 @@ EADD: %d%s
         <translation>(שום צלילות)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sun</source>
         <translation>ראשון</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Mon</source>
         <translation>שני</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Tue</source>
         <translation>שלישי</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Wed</source>
         <translation>רביעי</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Thu</source>
         <translation>חמישי</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Fri</source>
         <translation>שישי</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sat</source>
         <translation>שבת</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jan</source>
         <translation>ינואר</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Feb</source>
         <translation>פבואר</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Mar</source>
         <translation>מרץ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Apr</source>
         <translation>אפריל</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>May</source>
         <translation>מאי</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jun</source>
         <translation>יוני</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Jul</source>
         <translation>יולי</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Aug</source>
         <translation>אוגוסט</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Sep</source>
         <translation>ספטמבר</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Oct</source>
         <translation>אוקטובר</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Nov</source>
         <translation>נובמבר</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Dec</source>
         <translation>דצמבר</translation>
     </message>
@@ -7011,13 +7268,13 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
         <source>GF low</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>%</source>
         <translation type="unfinished"/>
     </message>
@@ -7027,7 +7284,7 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="335"/>
         <source>Drop to first depth</source>
         <translation type="unfinished"/>
     </message>
@@ -7037,69 +7294,69 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
         <source>Plan backgas breaks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="355"/>
         <source>Gas options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="376"/>
         <source>Bottom SAC</source>
         <translation>צריכת גז בעומק מירבי</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="383"/>
         <source>Deco SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="380"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="390"/>
         <source>Bottom pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="403"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="413"/>
         <source>Deco pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="449"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="462"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="478"/>
         <source>Dive notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
         <source>Display runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <source>Display segment duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="531"/>
         <source>Display transitions in deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="538"/>
         <source>Verbatim dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="387"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="410"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="397"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -7119,17 +7376,17 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="499"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="515"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/subsurface_hr_HR.ts b/translations/subsurface_hr_HR.ts
index c1c969200..3dd6f62ae 100644
--- a/translations/subsurface_hr_HR.ts
+++ b/translations/subsurface_hr_HR.ts
@@ -3,12 +3,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="539"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="522"/>
         <source>Person: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="540"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="523"/>
         <source>Searches for buddies and divemasters</source>
         <translation type="unfinished"/>
     </message>
@@ -16,40 +16,188 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="233"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="230"/>
         <source>No buddies</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>ColumnNameProvider</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>GPS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Avg depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="210"/>
+        <location filename="../configuredivecomputer.cpp" line="212"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="226"/>
+        <location filename="../configuredivecomputer.cpp" line="228"/>
         <source>Could not open backup file: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="542"/>
+        <location filename="../configuredivecomputer.cpp" line="552"/>
         <source>Dive computer details read successfully</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="551"/>
+        <location filename="../configuredivecomputer.cpp" line="561"/>
         <source>Setting successfully written to device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="560"/>
+        <location filename="../configuredivecomputer.cpp" line="570"/>
         <source>Device firmware successfully updated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="569"/>
+        <location filename="../configuredivecomputer.cpp" line="579"/>
         <source>Device settings successfully reset</source>
         <translation type="unfinished"/>
     </message>
@@ -847,70 +995,70 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1053"/>
         <source>Backup files (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1037"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1040"/>
         <source>Backup succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1041"/>
         <source>Your settings have been saved to: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1030"/>
         <source>Backup dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1036"/>
         <source>XML backup error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1052"/>
         <source>Restore dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1056"/>
         <source>XML restore error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1057"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1063"/>
         <source>Restore succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1064"/>
         <source>Your settings have been restored successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1074"/>
         <source>Select firmware file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1075"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -968,12 +1116,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="410"/>
         <source>Cylinder cannot be removed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="407"/>
+        <location filename="../qt-ui/models.cpp" line="411"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation type="unfinished"/>
     </message>
@@ -1049,12 +1197,12 @@
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="48"/>
         <source>Remove the selected dive computer?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="49"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
         <translation type="unfinished"/>
@@ -1068,22 +1216,22 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Model</source>
         <translation>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Device ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Nickname</source>
         <translation>Naziv uređaja</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -1091,117 +1239,145 @@
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="115"/>
         <source>Bailing out to OC</source>
         <translation>Neplanirani prelazak na OC sustav</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="117"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> započni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> završi</translation>
     </message>
 </context>
 <context>
+    <name>DiveImportedModel</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="556"/>
+        <source>Date/time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
+        <source>Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>h:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>min</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1242"/>
+        <location filename="../qt-ui/models.cpp" line="1248"/>
         <source>#</source>
         <translation>Br.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1245"/>
+        <location filename="../qt-ui/models.cpp" line="1251"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1248"/>
+        <location filename="../qt-ui/models.cpp" line="1254"/>
         <source>Rating</source>
         <translation>Ocjena</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1254"/>
+        <location filename="../qt-ui/models.cpp" line="1260"/>
         <source>Duration</source>
         <translation>Trajanje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1263"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1263"/>
+        <location filename="../qt-ui/models.cpp" line="1269"/>
         <source>Suit</source>
         <translation>Odijelo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1266"/>
+        <location filename="../qt-ui/models.cpp" line="1272"/>
         <source>Cyl</source>
         <translation>Boca</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1269"/>
+        <location filename="../qt-ui/models.cpp" line="1275"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1277"/>
+        <location filename="../qt-ui/models.cpp" line="1283"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1280"/>
+        <location filename="../qt-ui/models.cpp" line="1286"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1283"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>Location</source>
         <translation>Lokacija</translation>
     </message>
@@ -1209,87 +1385,87 @@
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="787"/>
+        <location filename="../qt-ui/divelistview.cpp" line="768"/>
         <source>Expand all</source>
         <translation>Otvori sve</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="788"/>
+        <location filename="../qt-ui/divelistview.cpp" line="769"/>
         <source>Collapse all</source>
         <translation>Zatvori sve grupe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="789"/>
+        <location filename="../qt-ui/divelistview.cpp" line="770"/>
         <source>Collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="791"/>
+        <location filename="../qt-ui/divelistview.cpp" line="772"/>
         <source>Remove dive(s) from trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="792"/>
+        <location filename="../qt-ui/divelistview.cpp" line="773"/>
         <source>Create new trip above</source>
         <translation>Kreiraj novu grupu iznad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="806"/>
+        <location filename="../qt-ui/divelistview.cpp" line="787"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="808"/>
+        <location filename="../qt-ui/divelistview.cpp" line="789"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="812"/>
+        <location filename="../qt-ui/divelistview.cpp" line="793"/>
         <source>Merge trip with trip above</source>
         <translation>Spoji s grupom iznad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="813"/>
+        <location filename="../qt-ui/divelistview.cpp" line="794"/>
         <source>Merge trip with trip below</source>
         <translation>Spoji s grupom ispod</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="817"/>
+        <location filename="../qt-ui/divelistview.cpp" line="798"/>
         <source>Delete dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="819"/>
+        <location filename="../qt-ui/divelistview.cpp" line="800"/>
         <source>Mark dive(s) invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="823"/>
+        <location filename="../qt-ui/divelistview.cpp" line="804"/>
         <source>Merge selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="825"/>
+        <location filename="../qt-ui/divelistview.cpp" line="806"/>
         <source>Renumber dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="826"/>
+        <location filename="../qt-ui/divelistview.cpp" line="807"/>
         <source>Shift times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="827"/>
+        <location filename="../qt-ui/divelistview.cpp" line="808"/>
         <source>Load images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Open image files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation type="unfinished"/>
     </message>
@@ -1474,100 +1650,100 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="268"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="68"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
         <source>Subsurface native XML format.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
         <source>Write depths of images to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export UDDF file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="267"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
         <source>Export CSV file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="278"/>
         <source>Export world map</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="299"/>
         <source>HTML files (*.html)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="283"/>
         <source>Export Subsurface XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="284"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
         <source>Save image depths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="298"/>
         <source>Export HTML files as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
         <source>Can&apos;t open file %s</source>
         <translation type="unfinished"/>
     </message>
@@ -1580,247 +1756,227 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
-        <source>CSV options</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="281"/>
-        <source>Pre-configured imports</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="122"/>
-        <source>Depth</source>
-        <translation>Dubina</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="142"/>
-        <source>Stopdepth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="162"/>
-        <source>Pressure</source>
-        <translation>Pritisak</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="176"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="466"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
         <source>Time</source>
         <translation>Vrijeme</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="183"/>
-        <source>Temp</source>
-        <translation>Temp</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="213"/>
-        <source>NDL</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="97"/>
+        <source>Metric</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="233"/>
-        <source>TTS</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="102"/>
+        <source>Imperial</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="253"/>
-        <source>Cns</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="59"/>
+        <source>dd.mm.yyyy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="58"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="789"/>
-        <source>Field separator</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="64"/>
+        <source>mm/dd/yyyy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="35"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="363"/>
-        <source>Units</source>
-        <translation>Jedinice</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="69"/>
+        <source>yyyy-mm-dd</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="42"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="370"/>
-        <source>Metric</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
+        <source>Drag the tags above to each corresponding column below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="47"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="375"/>
-        <source>Imperial</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+        <source>Dive #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="169"/>
-        <source>pO₂</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+        <source>Date</source>
+        <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="298"/>
-        <source>Manual dives</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+        <source>Duration</source>
+        <translation>Trajanje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="316"/>
-        <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+        <source>GPS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="319"/>
-        <source>Date format</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+        <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="332"/>
-        <source>dd.mm.yyyy</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+        <source>O₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="337"/>
-        <source>mm/dd/yyyy</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+        <source>He</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="342"/>
-        <source>yyyy-mm-dd</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="78"/>
+        <source>Seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="392"/>
-        <source>Dive #</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
+        <source>Minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="426"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="439"/>
-        <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="88"/>
+        <source>Minutes:seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="429"/>
-        <source>Date</source>
-        <translation>Datum</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+        <source>Location</source>
+        <translation>Lokacija</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="500"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="513"/>
-        <source>Dive duration in seconds or in min:sec format</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+        <source>Max depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="503"/>
-        <source>Duration</source>
-        <translation>Trajanje</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+        <source>Tab</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="574"/>
-        <source>GPS</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="591"/>
-        <source>Tags</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+        <source>Sample time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="608"/>
-        <source>Cyl size</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+        <source>Sample depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="625"/>
-        <source>Air temp</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+        <source>Sample temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="642"/>
-        <source>Start Pressure</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+        <source>Sample po2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="659"/>
-        <source>Water temp</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+        <source>Sample cns</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="676"/>
-        <source>End Press</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+        <source>Sample ndl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="693"/>
-        <source>O₂</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+        <source>Sample tts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="710"/>
-        <source>He</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+        <source>Sample stopdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="742"/>
-        <source>Choose duration format.</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+        <source>Samples pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="745"/>
-        <source>Duration format</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+        <source>Sample pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="758"/>
-        <source>Seconds</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+        <source>Mean depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="763"/>
-        <source>Minutes</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+        <source>Divemaster</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="768"/>
-        <source>Minutes:seconds</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+        <source>Buddy</source>
+        <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="540"/>
-        <source>Location</source>
-        <translation>Lokacija</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+        <source>Notes</source>
+        <translation>Bilješke</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="409"/>
-        <source>Max depth</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+        <source>Weight</source>
+        <translation>Težina</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="386"/>
-        <source>Field configuration</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+        <source>Cyl. size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="449"/>
-        <source>Mean depth</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+        <source>Start pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="483"/>
-        <source>Buddy</source>
-        <translation>Buddy</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="523"/>
-        <source>Notes</source>
-        <translation>Bilješke</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="557"/>
-        <source>Weight</source>
-        <translation>Težina</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1864,42 +2020,42 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
         <source>unknown</source>
         <translation>nepoznato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="691"/>
         <source>Final depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="693"/>
         <source>Run time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="701"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="695"/>
         <source>Duration</source>
         <translation>Trajanje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="703"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
         <source>Used gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="705"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
         <source>CC set point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1044"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1051"/>
         <source>Discard the plan?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1045"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1052"/>
         <source>You are about to discard your plan.</source>
         <translation type="unfinished"/>
     </message>
@@ -1907,22 +2063,22 @@
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="257"/>
         <source>Dive planner points</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="261"/>
         <source>Available gases</source>
         <translation>Dostupni plinovi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="284"/>
         <source>Add dive data point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="304"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="293"/>
         <source>Save new</source>
         <translation type="unfinished"/>
     </message>
@@ -1930,92 +2086,112 @@
 <context>
     <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Depth</source>
         <translation>Dubina</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
         <source>Time</source>
         <translation>Vrijeme</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
         <source>Pressure</source>
         <translation>Pritisak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
         <source>Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
         <source>Pressure S</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
         <source>pN₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
         <source>pHe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
         <source>pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
+        <source>Setpoint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
+        <source>Sensor1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
+        <source>Sensor2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
+        <source>Sensor3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
         <source>Ambient pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
-        <source>Heart Beat</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
+        <source>Heart beat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
-        <source>Gradient Factor</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/>
+        <source>Gradient factor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
-        <source>Mean Depth/s</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
+        <source>Mean depth/s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
         <source>Pressure I</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
         <source>User entered</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
         <source>Cylinder index</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
         <source>Ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
@@ -2066,127 +2242,127 @@
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1437"/>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1443"/>
+        <location filename="../qt-ui/models.cpp" line="1489"/>
         <source>#</source>
         <translation>Br.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1440"/>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1492"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1443"/>
-        <location filename="../qt-ui/models.cpp" line="1489"/>
+        <location filename="../qt-ui/models.cpp" line="1449"/>
+        <location filename="../qt-ui/models.cpp" line="1495"/>
         <source>Rating</source>
         <translation>Ocjena</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1452"/>
         <source>Depth</source>
         <translation>Dubina</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1458"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1461"/>
         <source>Weight</source>
         <translation>Težina</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1458"/>
-        <location filename="../qt-ui/models.cpp" line="1504"/>
+        <location filename="../qt-ui/models.cpp" line="1464"/>
+        <location filename="../qt-ui/models.cpp" line="1510"/>
         <source>Suit</source>
         <translation>Odijelo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1461"/>
-        <location filename="../qt-ui/models.cpp" line="1507"/>
+        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1513"/>
         <source>Cyl</source>
         <translation>Boca</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1464"/>
-        <location filename="../qt-ui/models.cpp" line="1510"/>
+        <location filename="../qt-ui/models.cpp" line="1470"/>
+        <location filename="../qt-ui/models.cpp" line="1516"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1473"/>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1527"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
-        <location filename="../qt-ui/models.cpp" line="1524"/>
+        <location filename="../qt-ui/models.cpp" line="1482"/>
+        <location filename="../qt-ui/models.cpp" line="1530"/>
         <source>Location</source>
         <translation>Lokacija</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1449"/>
-        <location filename="../qt-ui/models.cpp" line="1495"/>
+        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1501"/>
         <source>Duration</source>
         <translation>Trajanje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1498"/>
+        <location filename="../qt-ui/models.cpp" line="1504"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1470"/>
-        <location filename="../qt-ui/models.cpp" line="1518"/>
+        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1524"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -2194,94 +2370,94 @@
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="98"/>
         <source>no dives were selected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="117"/>
         <source>failed to create zip file for upload: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="143"/>
         <source>cannot create temporary file: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/>
         <source>internal error: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="169"/>
         <source>internal error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="629"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="828"/>
         <source>Done</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/>
         <source>Uploading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="692"/>
         <source>Downloading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="741"/>
         <source>Downloading %1 dives...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="785"/>
         <source>Download finished - %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="802"/>
         <source>Corrupted download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>The archive could not be opened:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
         <source>Upload failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/>
         <source>Upload successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
         <source>Login failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
         <source>Cannot parse response</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
         <source>Error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="829"/>
         <source>Upload finished</source>
         <translation type="unfinished"/>
     </message>
@@ -2289,54 +2465,52 @@
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
-        <source>OK</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="169"/>
         <source>Error</source>
         <translation>Greška</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="400"/>
         <source>Retry</source>
         <translation>Pokušaj ponovo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="264"/>
         <source>Find Uemis dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Log files (*.log)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="362"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="363"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="374"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="375"/>
         <source>Dump files (*.bin)</source>
         <translation type="unfinished"/>
     </message>
@@ -2344,7 +2518,7 @@
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="101"/>
         <source>Vendor</source>
         <translation type="unfinished"/>
     </message>
@@ -2354,54 +2528,74 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="31"/>
         <source>Device or mount point</source>
         <translation>Uređaj ili mount lokacija</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="111"/>
         <source>Dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="132"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="45"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="80"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="94"/>
         <source>...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="52"/>
         <source>Force download of all dives</source>
         <translation>Prisilno preuzimanje svih urona</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
         <source>Always prefer downloaded dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="189"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/>
+        <source>Downloaded Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
+        <source>Select all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
+        <source>Unselect all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
         <source>Save libdivecomputer logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="87"/>
         <source>Save libdivecomputer dumpfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
         <source>Download into new trip</source>
         <translation type="unfinished"/>
     </message>
@@ -2409,12 +2603,12 @@
 <context>
     <name>ExtraDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Value</source>
         <translation type="unfinished"/>
     </message>
@@ -2428,21 +2622,21 @@
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="245"/>
-        <source>Your dive profile was updated to facebook.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
-        <source>Photo Upload Failed</source>
+        <source>Your dive profile was updated to Facebook.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="250"/>
-        <source>Your dive profile was not updated to facebook, 
+        <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+        <source>Photo Upload Failed</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>FilterWidget</name>
@@ -2483,17 +2677,17 @@
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1544"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1621"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1624"/>
         <source>Firmware update failed!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1550"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1627"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -2501,7 +2695,7 @@
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="128"/>
+        <location filename="../qt-ui/globe.cpp" line="119"/>
         <source>Edit selected dive locations</source>
         <translation type="unfinished"/>
     </message>
@@ -2509,7 +2703,7 @@
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="566"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="549"/>
         <source>Location: </source>
         <translation type="unfinished"/>
     </message>
@@ -2517,7 +2711,7 @@
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="286"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="283"/>
         <source>No location set</source>
         <translation type="unfinished"/>
     </message>
@@ -2525,347 +2719,352 @@
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="133"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
+        <location filename="../qt-ui/maintab.cpp" line="497"/>
         <source>Location</source>
         <translation>Lokacija</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="67"/>
         <source>Coordinates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="169"/>
         <source>Divemaster</source>
         <translation>Voditelj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="154"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="222"/>
+        <location filename="../qt-ui/maintab.ui" line="277"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="186"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
         <source>Rating</source>
         <translation>Ocjena</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="221"/>
         <source>Visibility</source>
         <translation>Vidljivost</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="230"/>
         <source>Suit</source>
         <translation>Odijelo</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="465"/>
+        <location filename="../qt-ui/maintab.cpp" line="470"/>
         <source>Dive notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
-        <location filename="../qt-ui/maintab.ui" line="648"/>
-        <location filename="../qt-ui/maintab.cpp" line="277"/>
+        <location filename="../qt-ui/maintab.ui" line="74"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="102"/>
+        <location filename="../qt-ui/maintab.ui" line="677"/>
+        <location filename="../qt-ui/maintab.cpp" line="279"/>
         <source>Air temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <location filename="../qt-ui/maintab.ui" line="667"/>
-        <location filename="../qt-ui/maintab.cpp" line="278"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.ui" line="696"/>
+        <location filename="../qt-ui/maintab.cpp" line="280"/>
         <source>Water temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="229"/>
-        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.ui" line="284"/>
+        <location filename="../qt-ui/maintab.cpp" line="498"/>
         <source>Notes</source>
         <translation>Bilješke</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="369"/>
+        <location filename="../qt-ui/maintab.ui" line="398"/>
         <source>Equipment</source>
         <translation>Oprema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="496"/>
+        <location filename="../qt-ui/maintab.ui" line="525"/>
         <source>Gases used</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="515"/>
+        <location filename="../qt-ui/maintab.ui" line="544"/>
         <source>Gas consumed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="553"/>
+        <location filename="../qt-ui/maintab.ui" line="582"/>
         <source>CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="591"/>
+        <location filename="../qt-ui/maintab.ui" line="620"/>
         <source>Max. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="629"/>
+        <location filename="../qt-ui/maintab.ui" line="658"/>
         <source>Air pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="686"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>Dive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="845"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
         <source>Total time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="903"/>
+        <location filename="../qt-ui/maintab.ui" line="932"/>
         <source>Gas consumption</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="962"/>
+        <location filename="../qt-ui/maintab.ui" line="991"/>
         <source>Extra data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="968"/>
+        <location filename="../qt-ui/maintab.ui" line="997"/>
         <source>Additional data from dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="54"/>
-        <location filename="../qt-ui/maintab.ui" line="458"/>
+        <location filename="../qt-ui/maintab.ui" line="83"/>
+        <location filename="../qt-ui/maintab.ui" line="487"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="61"/>
+        <location filename="../qt-ui/maintab.ui" line="90"/>
         <source>Time</source>
         <translation>Vrijeme</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="425"/>
+        <location filename="../qt-ui/maintab.ui" line="454"/>
         <source>Dive info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="477"/>
+        <location filename="../qt-ui/maintab.ui" line="506"/>
         <source>Interval</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="534"/>
-        <location filename="../qt-ui/maintab.ui" line="799"/>
+        <location filename="../qt-ui/maintab.ui" line="563"/>
+        <location filename="../qt-ui/maintab.ui" line="828"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="610"/>
+        <location filename="../qt-ui/maintab.ui" line="639"/>
         <source>Avg. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="572"/>
+        <location filename="../qt-ui/maintab.ui" line="601"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="734"/>
         <source>Salinity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="742"/>
+        <location filename="../qt-ui/maintab.ui" line="771"/>
         <source>Stats</source>
         <translation>Statistike</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="775"/>
+        <location filename="../qt-ui/maintab.ui" line="804"/>
         <source>Depth</source>
         <translation>Dubina</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="787"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="813"/>
+        <location filename="../qt-ui/maintab.ui" line="842"/>
         <source>Duration</source>
         <translation>Trajanje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="864"/>
+        <location filename="../qt-ui/maintab.ui" line="893"/>
         <source>Dives</source>
         <translation>Uroni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="948"/>
+        <location filename="../qt-ui/maintab.ui" line="977"/>
         <source>Photos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="95"/>
+        <location filename="../qt-ui/maintab.cpp" line="87"/>
         <source>Cylinders</source>
         <translation>Boce</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="99"/>
+        <location filename="../qt-ui/maintab.cpp" line="91"/>
         <source>Weights</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="55"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Apply changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="59"/>
+        <location filename="../qt-ui/maintab.cpp" line="50"/>
         <source>Discard changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="96"/>
+        <location filename="../qt-ui/maintab.cpp" line="88"/>
         <source>Add cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="100"/>
+        <location filename="../qt-ui/maintab.cpp" line="92"/>
         <source>Add weight system</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="274"/>
+        <location filename="../qt-ui/maintab.cpp" line="276"/>
         <source>Air temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="275"/>
+        <location filename="../qt-ui/maintab.cpp" line="277"/>
         <source>Water temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="312"/>
+        <location filename="../qt-ui/maintab.cpp" line="314"/>
         <source>This trip is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="320"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Multiple dives are being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.cpp" line="324"/>
         <source>This dive is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="436"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
+        <location filename="../qt-ui/maintab.cpp" line="465"/>
         <source>Trip notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="458"/>
+        <location filename="../qt-ui/maintab.cpp" line="463"/>
         <source>Trip location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="526"/>
-        <location filename="../qt-ui/maintab.cpp" line="558"/>
-        <location filename="../qt-ui/maintab.cpp" line="562"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
         <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="574"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="555"/>
+        <location filename="../qt-ui/maintab.cpp" line="563"/>
         <source>Deepest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="556"/>
+        <location filename="../qt-ui/maintab.cpp" line="564"/>
         <source>Shallowest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="569"/>
+        <location filename="../qt-ui/maintab.cpp" line="577"/>
         <source>Highest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="578"/>
         <source>Lowest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="571"/>
+        <location filename="../qt-ui/maintab.cpp" line="579"/>
         <source>Average total SAC of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="582"/>
+        <location filename="../qt-ui/maintab.cpp" line="590"/>
         <source>Highest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="583"/>
+        <location filename="../qt-ui/maintab.cpp" line="591"/>
         <source>Lowest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="584"/>
+        <location filename="../qt-ui/maintab.cpp" line="592"/>
         <source>Average temperature of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="594"/>
+        <location filename="../qt-ui/maintab.cpp" line="602"/>
         <source>Longest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="595"/>
+        <location filename="../qt-ui/maintab.cpp" line="603"/>
         <source>Shortest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="596"/>
+        <location filename="../qt-ui/maintab.cpp" line="604"/>
         <source>Average length of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="620"/>
+        <location filename="../qt-ui/maintab.cpp" line="628"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="624"/>
+        <location filename="../qt-ui/maintab.cpp" line="632"/>
         <source> and </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="911"/>
+        <location filename="../qt-ui/maintab.cpp" line="925"/>
         <source>Discard the changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="912"/>
+        <location filename="../qt-ui/maintab.cpp" line="926"/>
         <source>You are about to discard your changes.</source>
         <translation type="unfinished"/>
     </message>
@@ -3008,7 +3207,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="296"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="232"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
@@ -3368,90 +3567,90 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="252"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="229"/>
         <source>Open file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="256"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="233"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="332"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="309"/>
         <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="444"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
         <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="491"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
         <source>Print runtime table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="834"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="811"/>
         <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="836"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="813"/>
         <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="841"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="818"/>
         <source>Save changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1196"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1173"/>
         <source>Save file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1337"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1314"/>
         <source>Open dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="819"/>
         <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="300"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="444"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="277"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1180"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1157"/>
         <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="625"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="602"/>
         <source>Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1197"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1174"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1338"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1315"/>
         <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"/>
     </message>
@@ -3459,7 +3658,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="651"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="634"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation type="unfinished"/>
     </message>
@@ -3467,39 +3666,39 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="239"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="243"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="244"/>
         <source>Not now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="245"/>
         <source>Update firmware</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
         <source>Firmware upgrade notice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
         <source>Save the downloaded firmware as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
         <source>HEX files (*.hex)</source>
         <translation type="unfinished"/>
     </message>
@@ -3507,54 +3706,69 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Open circuit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>ft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="481"/>
         <source>Last stop at 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="482"/>
         <source>50% avg. depth to 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="489"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
         <source>20ft to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="485"/>
         <source>m/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
         <source>Last stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
         <source>50% avg. depth to 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="494"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
         <source>6m to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="497"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="498"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
         <source>cuft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="506"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="507"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="500"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="501"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
@@ -3673,6 +3887,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="816"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -3707,57 +3922,87 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="795"/>
+        <source>CCR: Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="809"/>
+        <source>Default CCR set-point for dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="832"/>
+        <source>pSCR O₂ metabolism rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="839"/>
+        <source>pSCR ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="846"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="859"/>
+        <source>1:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="875"/>
         <source>System default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="843"/>
+        <location filename="../qt-ui/preferences.ui" line="914"/>
         <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="849"/>
+        <location filename="../qt-ui/preferences.ui" line="920"/>
         <source>Proxy type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="862"/>
+        <location filename="../qt-ui/preferences.ui" line="933"/>
         <source>Host</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="888"/>
+        <location filename="../qt-ui/preferences.ui" line="959"/>
         <source>Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="914"/>
+        <location filename="../qt-ui/preferences.ui" line="985"/>
         <source>Requires authentication</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="934"/>
+        <location filename="../qt-ui/preferences.ui" line="1005"/>
         <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="957"/>
+        <location filename="../qt-ui/preferences.ui" line="1028"/>
         <source>Password</source>
         <translation>Lozinka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="985"/>
-        <source>about:blank</source>
+        <location filename="../qt-ui/preferences.ui" line="1079"/>
+        <source>Disconnect from Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1011"/>
-        <source>Disconnect from facebook</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="824"/>
+        <location filename="../qt-ui/preferences.ui" line="895"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
@@ -3912,52 +4157,52 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="28"/>
+        <location filename="../qt-ui/preferences.cpp" line="44"/>
         <source>No proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="29"/>
+        <location filename="../qt-ui/preferences.cpp" line="45"/>
         <source>System proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="30"/>
+        <location filename="../qt-ui/preferences.cpp" line="46"/>
         <source>HTTP proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="31"/>
+        <location filename="../qt-ui/preferences.cpp" line="47"/>
         <source>SOCKS proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="291"/>
+        <location filename="../qt-ui/preferences.cpp" line="324"/>
         <source>Restart required</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="292"/>
+        <location filename="../qt-ui/preferences.cpp" line="325"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="456"/>
+        <location filename="../qt-ui/preferences.cpp" line="494"/>
         <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Open default log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="455"/>
+        <location filename="../qt-ui/preferences.cpp" line="493"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
@@ -3965,17 +4210,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="91"/>
+        <location filename="../qt-ui/printdialog.cpp" line="85"/>
         <source>&amp;Preview</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="88"/>
+        <location filename="../qt-ui/printdialog.cpp" line="82"/>
         <source>P&amp;rint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="103"/>
+        <location filename="../qt-ui/printdialog.cpp" line="97"/>
         <source>Print</source>
         <translation type="unfinished"/>
     </message>
@@ -3983,42 +4228,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="20"/>
         <source>Dive#</source>
         <translation>Uron br.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="21"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="22"/>
         <source>Depth</source>
         <translation>Dubina</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="23"/>
         <source>Duration</source>
         <translation>Trajanje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Master</source>
         <translation>Master</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="34"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Location</source>
         <translation>Lokacija</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <location filename="../qt-ui/printlayout.cpp" line="63"/>
         <source>Subsurface cannot find a usable printer on this system!</source>
         <translation type="unfinished"/>
     </message>
@@ -4084,72 +4329,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2095"/>
+        <location filename="../qt-ui/models.cpp" line="2101"/>
         <source>unknown</source>
         <translation>nepoznato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2100"/>
+        <location filename="../qt-ui/models.cpp" line="2106"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2103"/>
+        <location filename="../qt-ui/models.cpp" line="2109"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2110"/>
+        <location filename="../qt-ui/models.cpp" line="2116"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2115"/>
+        <location filename="../qt-ui/models.cpp" line="2121"/>
         <source>Gas used:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2117"/>
+        <location filename="../qt-ui/models.cpp" line="2123"/>
         <source>Tags:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2119"/>
+        <location filename="../qt-ui/models.cpp" line="2125"/>
         <source>SAC:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2121"/>
+        <location filename="../qt-ui/models.cpp" line="2127"/>
         <source>Weights:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2126"/>
+        <location filename="../qt-ui/models.cpp" line="2132"/>
         <source>Notes:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2133"/>
+        <location filename="../qt-ui/models.cpp" line="2139"/>
         <source>Divemaster:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2135"/>
+        <location filename="../qt-ui/models.cpp" line="2141"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2137"/>
+        <location filename="../qt-ui/models.cpp" line="2143"/>
         <source>Suit:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2139"/>
+        <location filename="../qt-ui/models.cpp" line="2145"/>
         <source>Viz:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2141"/>
+        <location filename="../qt-ui/models.cpp" line="2147"/>
         <source>Rating:</source>
         <translation type="unfinished"/>
     </message>
@@ -4157,103 +4402,108 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="628"/>
         <source> (#%1 of %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="630"/>
+        <source>Unknown dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="647"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1168"/>
         <source>Make first divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Delete this divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1184"/>
         <source>Add gas change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1187"/>
         <source> (Tank %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1195"/>
         <source>Add set-point change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1197"/>
         <source>Add bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
         <source>Remove event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1206"/>
         <source>Hide similar events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1213"/>
         <source>Edit name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1242"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1249"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1264"/>
         <source>Unhide all events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide all %1 events?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1333"/>
         <source>Remove the selected event?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1334"/>
         <source>%1 @ %2:%3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1424"/>
         <source>Edit name of bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
         <source>Custom name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1430"/>
         <source>Name is too long!</source>
         <translation type="unfinished"/>
     </message>
@@ -4261,102 +4511,102 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>AIR</source>
         <translation>Zrak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>OXYGEN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="208"/>
         <source>Remove this point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="57"/>
         <source>Close</source>
         <translation>Zatvori</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="42"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="25"/>
         <source>Average</source>
         <translation>Ø</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="45"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="28"/>
         <source>Minimum</source>
         <translation>Min.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="48"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="31"/>
         <source>Maximum</source>
         <translation>Max.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="297"/>
+        <location filename="../qt-ui/globe.cpp" line="296"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="525"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="526"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="550"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="551"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="570"/>
+        <location filename="../qt-ui/models.cpp" line="574"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="571"/>
+        <location filename="../qt-ui/models.cpp" line="575"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="595"/>
+        <location filename="../qt-ui/models.cpp" line="599"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="596"/>
+        <location filename="../qt-ui/models.cpp" line="600"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="513"/>
         <source>Invalid response from server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="567"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation type="unfinished"/>
     </message>
@@ -4364,12 +4614,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1450"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1518"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1442"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -4383,12 +4633,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
-        <location filename="../qt-ui/simplewidgets.cpp" line="151"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="134"/>
         <source>New starting number</source>
         <translation>Novi početni broj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="149"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="132"/>
         <source>New number</source>
         <translation type="unfinished"/>
     </message>
@@ -4396,12 +4646,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1575"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1653"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1579"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1657"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -4480,12 +4730,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="276"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="259"/>
         <source>Open image file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="278"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="261"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation type="unfinished"/>
     </message>
@@ -4538,7 +4788,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <name>SocialNetworkDialog</name>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="282"/>
-        <source>Dive Date: %1 
+        <source>Dive date: %1 
 </source>
         <translation type="unfinished"/>
     </message>
@@ -4562,7 +4812,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="290"/>
-        <source>Dive Location: %1 
+        <source>Dive location: %1 
 </source>
         <translation type="unfinished"/>
     </message>
@@ -4679,47 +4929,47 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="329"/>
         <source>Webservice</source>
         <translation>Web servis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="393"/>
         <source>Connecting...</source>
         <translation>Spajanje...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
         <source>Download finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Download error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="436"/>
         <source>Connection error: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
         <source>Download successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="439"/>
         <source>Invalid user identifier!</source>
         <translation>Neispravna korisnička oznaka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="312"/>
         <source>Enter User ID and click Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="442"/>
         <source>Cannot parse response!</source>
         <translation>Ne mogu obraditi odziv</translation>
     </message>
@@ -4727,7 +4977,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="592"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="575"/>
         <source>Suits: </source>
         <translation type="unfinished"/>
     </message>
@@ -4735,7 +4985,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="119"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="116"/>
         <source>No suit set</source>
         <translation type="unfinished"/>
     </message>
@@ -4752,7 +5002,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="513"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="496"/>
         <source>Tags: </source>
         <translation type="unfinished"/>
     </message>
@@ -4760,7 +5010,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="144"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="141"/>
         <source>Empty tags</source>
         <translation type="unfinished"/>
     </message>
@@ -4768,17 +5018,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -4786,7 +5036,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="141"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="131"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
@@ -4794,7 +5044,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1090"/>
+        <location filename="../qt-ui/models.cpp" line="1094"/>
         <source> (%1 shown)</source>
         <translation type="unfinished"/>
     </message>
@@ -4802,72 +5052,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="64"/>
         <source>Check for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="66"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="70"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="72"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
         <source>Please check your internet connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="85"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="84"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="88"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="95"/>
         <source>A new version of Subsurface is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="97"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
         <source>Latest version is %1, please check with your OS vendor for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="103"/>
         <source>Newest release version is </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="105"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
         <source>The server returned the following information:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="121"/>
         <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
         <source>Decline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="124"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
         <source>Accept</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="126"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="125"/>
         <source>Automatic check for updates</source>
         <translation type="unfinished"/>
     </message>
@@ -4875,13 +5125,13 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UserManual</name>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="55"/>
+        <location filename="../qt-ui/usermanual.cpp" line="54"/>
         <source>User Manual</source>
         <translation>Korisnički priručnik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="72"/>
-        <location filename="../qt-ui/usermanual.cpp" line="78"/>
+        <location filename="../qt-ui/usermanual.cpp" line="71"/>
+        <location filename="../qt-ui/usermanual.cpp" line="77"/>
         <source>Cannot find the Subsurface manual</source>
         <translation type="unfinished"/>
     </message>
@@ -4959,81 +5209,81 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
         <source>
 Operating System: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
         <source>
 CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 Language: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="93"/>
         <source>Should we ask you later?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Don&apos;t ask me again</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Ask later</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
         <source>Submit user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask again?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="17"/>
         <source>Send</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="121"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>Please check your internet connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="131"/>
         <source>Survey successfully submitted.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="136"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation type="unfinished"/>
     </message>
@@ -5041,12 +5291,12 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -5094,12 +5344,12 @@ OS CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="247"/>
         <source>Operation timed out</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="268"/>
         <source>Transferring data...</source>
         <translation type="unfinished"/>
     </message>
@@ -5107,17 +5357,17 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Type</source>
         <translation>Vrsta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Weight</source>
         <translation>Težina</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="496"/>
+        <location filename="../qt-ui/models.cpp" line="500"/>
         <source>Clicking here will remove this weight system.</source>
         <translation type="unfinished"/>
     </message>
@@ -5125,19 +5375,19 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1479"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1487"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1497"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1555"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1566"/>
         <source>Failed!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1506"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1576"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1580"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -5145,70 +5395,70 @@ OS CPU Architecture: %1</source>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1841"/>
+        <location filename="../qt-ui/models.cpp" line="1847"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1844"/>
+        <location filename="../qt-ui/models.cpp" line="1850"/>
         <source>#</source>
         <translation>Br.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1847"/>
+        <location filename="../qt-ui/models.cpp" line="1853"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1850"/>
+        <location filename="../qt-ui/models.cpp" line="1856"/>
         <source>
 Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1853"/>
+        <location filename="../qt-ui/models.cpp" line="1859"/>
         <source>
 Shortest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1856"/>
+        <location filename="../qt-ui/models.cpp" line="1862"/>
         <source>
 Longest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1859"/>
+        <location filename="../qt-ui/models.cpp" line="1865"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1862"/>
-        <location filename="../qt-ui/models.cpp" line="1871"/>
-        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>
 Minimum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1865"/>
-        <location filename="../qt-ui/models.cpp" line="1874"/>
-        <location filename="../qt-ui/models.cpp" line="1883"/>
+        <location filename="../qt-ui/models.cpp" line="1871"/>
+        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>
 Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1874"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1883"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"/>
@@ -5288,40 +5538,40 @@ Maximum</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1508"/>
+        <location filename="../dive.c" line="1530"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) ili (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="464"/>
+        <location filename="../divelist.c" line="467"/>
         <location filename="../equipment.c" line="81"/>
-        <location filename="../planner.c" line="1060"/>
-        <location filename="../planner.c" line="1063"/>
+        <location filename="../planner.c" line="1081"/>
+        <location filename="../planner.c" line="1084"/>
         <source>air</source>
         <translation>zrak</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="192"/>
+        <location filename="../equipment.c" line="194"/>
         <source>integrated</source>
         <translation>integrirani</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="193"/>
+        <location filename="../equipment.c" line="195"/>
         <source>belt</source>
         <translation>pojas</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="194"/>
+        <location filename="../equipment.c" line="196"/>
         <source>ankle</source>
         <translation>gležanj</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="195"/>
+        <location filename="../equipment.c" line="197"/>
         <source>backplate weight</source>
         <translation>backplate olova</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="196"/>
+        <location filename="../equipment.c" line="198"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -5329,7 +5579,7 @@ Maximum</source>
         <location filename="../file.c" line="112"/>
         <location filename="../file.c" line="434"/>
         <location filename="../file.c" line="506"/>
-        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="925"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Nije uspjelo čitanje &apos;%s&apos;</translation>
     </message>
@@ -5386,9 +5636,9 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../file.c" line="869"/>
-        <location filename="../file.c" line="909"/>
-        <location filename="../file.c" line="1007"/>
+        <location filename="../file.c" line="870"/>
+        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="1016"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation type="unfinished"/>
     </message>
@@ -5559,27 +5809,27 @@ Maximum</source>
         <translation>neispravan broj događaja</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="421"/>
+        <location filename="../libdivecomputer.c" line="419"/>
         <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="427"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Error registering the data</source>
         <translation>Greška pri registraciji podataka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="433"/>
         <source>Error parsing the datetime</source>
         <translation>Greška pri parsiranju datuma i vremena</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Dive %d: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="455"/>
+        <location filename="../libdivecomputer.c" line="454"/>
         <source>Error parsing the divetime</source>
         <translation>Greška pri parsiranju vremena urona</translation>
     </message>
@@ -5589,156 +5839,156 @@ Maximum</source>
         <translation>Greška pri parsiranju maksimalne dubine</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="482"/>
+        <location filename="../libdivecomputer.c" line="483"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="501"/>
+        <location filename="../libdivecomputer.c" line="503"/>
         <source>Error parsing the gas mix count</source>
         <translation>Greška pri parsiranju broja mješavina</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="513"/>
+        <location filename="../libdivecomputer.c" line="515"/>
         <source>Error obtaining water salinity</source>
         <translation>Greška pri dohvaćanju saliniteta vode</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="521"/>
+        <location filename="../libdivecomputer.c" line="524"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="545"/>
+        <location filename="../libdivecomputer.c" line="549"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="562"/>
+        <location filename="../libdivecomputer.c" line="569"/>
         <source>Error parsing the gas mix</source>
         <translation>Greška pri parsiranju mješavine plinova</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="569"/>
+        <location filename="../libdivecomputer.c" line="576"/>
         <source>Error parsing the samples</source>
         <translation>Greška pri parsiranju uzoraka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="706"/>
+        <location filename="../libdivecomputer.c" line="713"/>
         <source>Event: waiting for user action</source>
         <translation>Događaj: čekanje na korisničku akciju</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="714"/>
+        <location filename="../libdivecomputer.c" line="721"/>
         <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="778"/>
+        <location filename="../libdivecomputer.c" line="785"/>
         <source>Error registering the event handler.</source>
         <translation>Greška pri registraciji event handlera.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="783"/>
+        <location filename="../libdivecomputer.c" line="790"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Greška pri registraciji cancellation handlera</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="804"/>
+        <location filename="../libdivecomputer.c" line="811"/>
         <source>Dive data import error</source>
         <translation>Greška pri uvozu podataka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="843"/>
+        <location filename="../libdivecomputer.c" line="850"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Ne mogu kreirati libdivecomputer kontekst</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="850"/>
+        <location filename="../libdivecomputer.c" line="857"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Nije uspjelo otvaranje %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="858"/>
+        <location filename="../libdivecomputer.c" line="865"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="506"/>
+        <location filename="../parse-xml.c" line="516"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Neobično očitanje postotka %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1760"/>
+        <location filename="../parse-xml.c" line="1770"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Nije uspjelo parsiranje &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1989"/>
-        <location filename="../parse-xml.c" line="2137"/>
+        <location filename="../parse-xml.c" line="1999"/>
+        <location filename="../parse-xml.c" line="2147"/>
         <source>Database query dm4_events failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1996"/>
-        <location filename="../parse-xml.c" line="2144"/>
+        <location filename="../parse-xml.c" line="2006"/>
+        <location filename="../parse-xml.c" line="2154"/>
         <source>Database query dm4_tags failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2318"/>
+        <location filename="../parse-xml.c" line="2328"/>
         <source>Database query shearwater_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2325"/>
+        <location filename="../parse-xml.c" line="2335"/>
         <source>Database query shearwater_changes failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2332"/>
+        <location filename="../parse-xml.c" line="2342"/>
         <source>Database query shearwater_profile_sample failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2451"/>
+        <location filename="../parse-xml.c" line="2461"/>
         <source>Database query cobalt_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2458"/>
+        <location filename="../parse-xml.c" line="2468"/>
         <source>Database query cobalt_buddies failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2465"/>
+        <location filename="../parse-xml.c" line="2475"/>
         <source>Database query cobalt_visibility failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2472"/>
+        <location filename="../parse-xml.c" line="2482"/>
         <source>Database query cobalt_location failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2479"/>
+        <location filename="../parse-xml.c" line="2489"/>
         <source>Database query cobalt_location (site) failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2486"/>
+        <location filename="../parse-xml.c" line="2496"/>
         <source>Database query cobalt_profile_sample failed.
 </source>
         <translation type="unfinished"/>
@@ -5751,17 +6001,17 @@ Maximum</source>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2168"/>
-        <location filename="../parse-xml.c" line="2189"/>
-        <location filename="../parse-xml.c" line="2508"/>
-        <location filename="../parse-xml.c" line="2527"/>
+        <location filename="../parse-xml.c" line="2178"/>
+        <location filename="../parse-xml.c" line="2199"/>
+        <location filename="../parse-xml.c" line="2518"/>
+        <location filename="../parse-xml.c" line="2537"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Neuspjeo upit na bazu &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2848"/>
+        <location filename="../parse-xml.c" line="2909"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation type="unfinished"/>
     </message>
@@ -5771,361 +6021,367 @@ Maximum</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="820"/>
+        <location filename="../planner.c" line="841"/>
         <source>Can&apos;t find gas %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="356"/>
+        <location filename="../planner.c" line="363"/>
         <source>Too many gas mixes</source>
         <translation>Previše mješavina plinova</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="540"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="548"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="544"/>
+        <location filename="../planner.c" line="551"/>
         <source>Subsurface dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="548"/>
+        <location filename="../planner.c" line="555"/>
         <source>depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="558"/>
         <source>runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="554"/>
+        <location filename="../planner.c" line="561"/>
         <source>duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="557"/>
+        <location filename="../planner.c" line="564"/>
         <source>gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="594"/>
+        <location filename="../planner.c" line="601"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="602"/>
+        <location filename="../planner.c" line="609"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="615"/>
+        <location filename="../planner.c" line="622"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="622"/>
+        <location filename="../planner.c" line="629"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="635"/>
+        <location filename="../planner.c" line="642"/>
         <source>%3.0f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="638"/>
-        <location filename="../planner.c" line="642"/>
+        <location filename="../planner.c" line="645"/>
+        <location filename="../planner.c" line="649"/>
         <source>%3dmin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="651"/>
+        <location filename="../planner.c" line="658"/>
         <source>(SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="676"/>
+        <location filename="../planner.c" line="683"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="678"/>
+        <location filename="../planner.c" line="685"/>
         <source>Switch gas to %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="697"/>
+        <location filename="../planner.c" line="704"/>
         <source>CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="699"/>
+        <location filename="../planner.c" line="706"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="710"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="705"/>
+        <location filename="../planner.c" line="712"/>
         <source>Gas consumption:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="535"/>
-        <location filename="../planner.c" line="725"/>
-        <location filename="../planner.c" line="730"/>
-        <location filename="../planner.c" line="753"/>
+        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="732"/>
+        <location filename="../planner.c" line="737"/>
+        <location filename="../planner.c" line="762"/>
+        <location filename="../planner.c" line="772"/>
         <source>Warning:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="523"/>
+        <location filename="../planner.c" line="530"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="726"/>
+        <location filename="../planner.c" line="733"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="731"/>
+        <location filename="../planner.c" line="738"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="733"/>
+        <location filename="../planner.c" line="740"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="735"/>
+        <location filename="../planner.c" line="742"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="759"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="1064"/>
+        <location filename="../planner.c" line="769"/>
+        <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="1085"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1099"/>
+        <location filename="../profile.c" line="1113"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1102"/>
+        <location filename="../profile.c" line="1116"/>
         <source>P: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1106"/>
+        <location filename="../profile.c" line="1120"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1112"/>
+        <location filename="../profile.c" line="1126"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1115"/>
+        <location filename="../profile.c" line="1129"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1117"/>
+        <location filename="../profile.c" line="1131"/>
         <source>CNS: %u%%
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1119"/>
+        <location filename="../profile.c" line="1133"/>
         <source>pO%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1121"/>
+        <location filename="../profile.c" line="1135"/>
         <source>pN%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1123"/>
+        <location filename="../profile.c" line="1137"/>
         <source>pHe: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1140"/>
         <source>MOD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1147"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1137"/>
+        <location filename="../profile.c" line="1151"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1149"/>
+        <location filename="../profile.c" line="1163"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1152"/>
+        <location filename="../profile.c" line="1166"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1157"/>
+        <location filename="../profile.c" line="1171"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1174"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1178"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1166"/>
+        <location filename="../profile.c" line="1180"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1183"/>
         <source>TTS: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1172"/>
+        <location filename="../profile.c" line="1186"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1180"/>
+        <location filename="../profile.c" line="1194"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1196"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1185"/>
+        <location filename="../profile.c" line="1199"/>
         <source>TTS: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1188"/>
+        <location filename="../profile.c" line="1202"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1194"/>
+        <location filename="../profile.c" line="1208"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1214"/>
         <source>heartbeat: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1202"/>
+        <location filename="../profile.c" line="1216"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1205"/>
+        <location filename="../profile.c" line="1219"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1314"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1304"/>
-        <location filename="../profile.c" line="1308"/>
-        <location filename="../profile.c" line="1312"/>
+        <location filename="../profile.c" line="1318"/>
+        <location filename="../profile.c" line="1322"/>
+        <location filename="../profile.c" line="1326"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1316"/>
+        <location filename="../profile.c" line="1330"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1334"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1324"/>
-        <location filename="../profile.c" line="1328"/>
+        <location filename="../profile.c" line="1338"/>
+        <location filename="../profile.c" line="1342"/>
         <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1335"/>
+        <location filename="../profile.c" line="1349"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
@@ -6256,6 +6512,7 @@ EADD: %d%s
     </message>
     <message>
         <location filename="../dive.c" line="30"/>
+        <location filename="../equipment.c" line="85"/>
         <source>oxygen</source>
         <translation type="unfinished"/>
     </message>
@@ -6310,97 +6567,97 @@ EADD: %d%s
         <translation>(nema urona)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sun</source>
         <translation>Ned</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Mon</source>
         <translation>Pon</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Tue</source>
         <translation>Uto</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Wed</source>
         <translation>Sri</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Thu</source>
         <translation>Čet</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Fri</source>
         <translation>Pet</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sat</source>
         <translation>Sub</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jan</source>
         <translation>Sij</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Feb</source>
         <translation>Velj</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Mar</source>
         <translation>Ožu</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Apr</source>
         <translation>Tra</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>May</source>
         <translation>Svi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jun</source>
         <translation>Lip</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Jul</source>
         <translation>Srp</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Aug</source>
         <translation>Kol</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Sep</source>
         <translation>Ruj</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Oct</source>
         <translation>Lis</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Nov</source>
         <translation>Stu</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Dec</source>
         <translation>Pro</translation>
     </message>
@@ -7004,13 +7261,13 @@ Je li Uemis Zurich ispravno priključen?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
         <source>GF low</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>%</source>
         <translation type="unfinished"/>
     </message>
@@ -7020,7 +7277,7 @@ Je li Uemis Zurich ispravno priključen?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="335"/>
         <source>Drop to first depth</source>
         <translation type="unfinished"/>
     </message>
@@ -7030,69 +7287,69 @@ Je li Uemis Zurich ispravno priključen?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
         <source>Plan backgas breaks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="355"/>
         <source>Gas options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="376"/>
         <source>Bottom SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="383"/>
         <source>Deco SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="380"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="390"/>
         <source>Bottom pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="403"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="413"/>
         <source>Deco pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="449"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="462"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="478"/>
         <source>Dive notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
         <source>Display runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <source>Display segment duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="531"/>
         <source>Display transitions in deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="538"/>
         <source>Verbatim dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="387"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="410"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="397"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -7112,17 +7369,17 @@ Je li Uemis Zurich ispravno priključen?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="499"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="515"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/subsurface_hu.ts b/translations/subsurface_hu.ts
index 3309fbdc0..c5b50b116 100644
--- a/translations/subsurface_hu.ts
+++ b/translations/subsurface_hu.ts
@@ -3,12 +3,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="539"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="522"/>
         <source>Person: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="540"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="523"/>
         <source>Searches for buddies and divemasters</source>
         <translation type="unfinished"/>
     </message>
@@ -16,40 +16,188 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="233"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="230"/>
         <source>No buddies</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>ColumnNameProvider</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>GPS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Avg depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="210"/>
+        <location filename="../configuredivecomputer.cpp" line="212"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="226"/>
+        <location filename="../configuredivecomputer.cpp" line="228"/>
         <source>Could not open backup file: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="542"/>
+        <location filename="../configuredivecomputer.cpp" line="552"/>
         <source>Dive computer details read successfully</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="551"/>
+        <location filename="../configuredivecomputer.cpp" line="561"/>
         <source>Setting successfully written to device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="560"/>
+        <location filename="../configuredivecomputer.cpp" line="570"/>
         <source>Device firmware successfully updated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="569"/>
+        <location filename="../configuredivecomputer.cpp" line="579"/>
         <source>Device settings successfully reset</source>
         <translation type="unfinished"/>
     </message>
@@ -847,70 +995,70 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1053"/>
         <source>Backup files (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1037"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1040"/>
         <source>Backup succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1041"/>
         <source>Your settings have been saved to: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1030"/>
         <source>Backup dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1036"/>
         <source>XML backup error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1052"/>
         <source>Restore dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1056"/>
         <source>XML restore error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1057"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1063"/>
         <source>Restore succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1064"/>
         <source>Your settings have been restored successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1074"/>
         <source>Select firmware file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1075"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -968,12 +1116,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="410"/>
         <source>Cylinder cannot be removed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="407"/>
+        <location filename="../qt-ui/models.cpp" line="411"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation type="unfinished"/>
     </message>
@@ -1049,12 +1197,12 @@
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="48"/>
         <source>Remove the selected dive computer?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="49"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
         <translation type="unfinished"/>
@@ -1068,22 +1216,22 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Model</source>
         <translation>Típús</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Device ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Nickname</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -1091,117 +1239,145 @@
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="115"/>
         <source>Bailing out to OC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="117"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>kezdés</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>befejezés</translation>
     </message>
 </context>
 <context>
+    <name>DiveImportedModel</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="556"/>
+        <source>Date/time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
+        <source>Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>h:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>min</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1242"/>
+        <location filename="../qt-ui/models.cpp" line="1248"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1245"/>
+        <location filename="../qt-ui/models.cpp" line="1251"/>
         <source>Date</source>
         <translation>Dátum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1248"/>
+        <location filename="../qt-ui/models.cpp" line="1254"/>
         <source>Rating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1254"/>
+        <location filename="../qt-ui/models.cpp" line="1260"/>
         <source>Duration</source>
         <translation>Tartam</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1263"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>kg</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>lbs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1263"/>
+        <location filename="../qt-ui/models.cpp" line="1269"/>
         <source>Suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1266"/>
+        <location filename="../qt-ui/models.cpp" line="1272"/>
         <source>Cyl</source>
         <translation>Pal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1269"/>
+        <location filename="../qt-ui/models.cpp" line="1275"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1277"/>
+        <location filename="../qt-ui/models.cpp" line="1283"/>
         <source>OTU</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1280"/>
+        <location filename="../qt-ui/models.cpp" line="1286"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1283"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>Location</source>
         <translation>Hely</translation>
     </message>
@@ -1209,87 +1385,87 @@
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="787"/>
+        <location filename="../qt-ui/divelistview.cpp" line="768"/>
         <source>Expand all</source>
         <translation>Mind kinyit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="788"/>
+        <location filename="../qt-ui/divelistview.cpp" line="769"/>
         <source>Collapse all</source>
         <translation>Összes összecsukása</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="789"/>
+        <location filename="../qt-ui/divelistview.cpp" line="770"/>
         <source>Collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="791"/>
+        <location filename="../qt-ui/divelistview.cpp" line="772"/>
         <source>Remove dive(s) from trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="792"/>
+        <location filename="../qt-ui/divelistview.cpp" line="773"/>
         <source>Create new trip above</source>
         <translation>Túra létrehozása fentebb</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="806"/>
+        <location filename="../qt-ui/divelistview.cpp" line="787"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="808"/>
+        <location filename="../qt-ui/divelistview.cpp" line="789"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="812"/>
+        <location filename="../qt-ui/divelistview.cpp" line="793"/>
         <source>Merge trip with trip above</source>
         <translation>Túra egyesítése a fentivel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="813"/>
+        <location filename="../qt-ui/divelistview.cpp" line="794"/>
         <source>Merge trip with trip below</source>
         <translation>Túra egyesítése a lentivel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="817"/>
+        <location filename="../qt-ui/divelistview.cpp" line="798"/>
         <source>Delete dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="819"/>
+        <location filename="../qt-ui/divelistview.cpp" line="800"/>
         <source>Mark dive(s) invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="823"/>
+        <location filename="../qt-ui/divelistview.cpp" line="804"/>
         <source>Merge selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="825"/>
+        <location filename="../qt-ui/divelistview.cpp" line="806"/>
         <source>Renumber dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="826"/>
+        <location filename="../qt-ui/divelistview.cpp" line="807"/>
         <source>Shift times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="827"/>
+        <location filename="../qt-ui/divelistview.cpp" line="808"/>
         <source>Load images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Open image files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation type="unfinished"/>
     </message>
@@ -1474,100 +1650,100 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="268"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="68"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
         <source>Subsurface native XML format.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
         <source>Write depths of images to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export UDDF file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="267"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
         <source>Export CSV file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="278"/>
         <source>Export world map</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="299"/>
         <source>HTML files (*.html)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="283"/>
         <source>Export Subsurface XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="284"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
         <source>Save image depths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="298"/>
         <source>Export HTML files as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
         <source>Can&apos;t open file %s</source>
         <translation type="unfinished"/>
     </message>
@@ -1580,246 +1756,226 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
-        <source>CSV options</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
+        <source>Time</source>
+        <translation>Idő</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="281"/>
-        <source>Pre-configured imports</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="97"/>
+        <source>Metric</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="122"/>
-        <source>Depth</source>
-        <translation>Mélység</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="142"/>
-        <source>Stopdepth</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="102"/>
+        <source>Imperial</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="162"/>
-        <source>Pressure</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="59"/>
+        <source>dd.mm.yyyy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="176"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="466"/>
-        <source>Time</source>
-        <translation>Idő</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="183"/>
-        <source>Temp</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="64"/>
+        <source>mm/dd/yyyy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="213"/>
-        <source>NDL</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="69"/>
+        <source>yyyy-mm-dd</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="233"/>
-        <source>TTS</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
+        <source>Drag the tags above to each corresponding column below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="253"/>
-        <source>Cns</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+        <source>Dive #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="58"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="789"/>
-        <source>Field separator</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+        <source>Date</source>
+        <translation>Dátum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="35"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="363"/>
-        <source>Units</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+        <source>Duration</source>
+        <translation>Tartam</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="42"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="370"/>
-        <source>Metric</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+        <source>GPS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="47"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="375"/>
-        <source>Imperial</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+        <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="169"/>
-        <source>pO₂</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+        <source>O₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="298"/>
-        <source>Manual dives</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+        <source>He</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="316"/>
-        <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="78"/>
+        <source>Seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="319"/>
-        <source>Date format</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
+        <source>Minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="332"/>
-        <source>dd.mm.yyyy</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="88"/>
+        <source>Minutes:seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="337"/>
-        <source>mm/dd/yyyy</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+        <source>Location</source>
+        <translation>Hely</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="342"/>
-        <source>yyyy-mm-dd</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+        <source>Max depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="392"/>
-        <source>Dive #</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+        <source>Tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="426"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="439"/>
-        <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="429"/>
-        <source>Date</source>
-        <translation>Dátum</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="500"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="513"/>
-        <source>Dive duration in seconds or in min:sec format</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+        <source>Sample time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="503"/>
-        <source>Duration</source>
-        <translation>Tartam</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="574"/>
-        <source>GPS</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+        <source>Sample depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="591"/>
-        <source>Tags</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+        <source>Sample temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="608"/>
-        <source>Cyl size</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+        <source>Sample po2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="625"/>
-        <source>Air temp</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+        <source>Sample cns</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="642"/>
-        <source>Start Pressure</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+        <source>Sample ndl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="659"/>
-        <source>Water temp</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+        <source>Sample tts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="676"/>
-        <source>End Press</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+        <source>Sample stopdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="693"/>
-        <source>O₂</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+        <source>Samples pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="710"/>
-        <source>He</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+        <source>Sample pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="742"/>
-        <source>Choose duration format.</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+        <source>Mean depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="745"/>
-        <source>Duration format</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+        <source>Divemaster</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="758"/>
-        <source>Seconds</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+        <source>Buddy</source>
+        <translation>Társ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="763"/>
-        <source>Minutes</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+        <source>Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="768"/>
-        <source>Minutes:seconds</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+        <source>Weight</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="540"/>
-        <source>Location</source>
-        <translation>Hely</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="409"/>
-        <source>Max depth</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+        <source>Cyl. size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="386"/>
-        <source>Field configuration</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+        <source>Start pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="449"/>
-        <source>Mean depth</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+        <source>End pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="483"/>
-        <source>Buddy</source>
-        <translation>Társ</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="523"/>
-        <source>Notes</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+        <source>Air temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="557"/>
-        <source>Weight</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+        <source>Water temp.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1864,42 +2020,42 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
         <source>unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="691"/>
         <source>Final depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="693"/>
         <source>Run time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="701"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="695"/>
         <source>Duration</source>
         <translation>Tartam</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="703"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
         <source>Used gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="705"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
         <source>CC set point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1044"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1051"/>
         <source>Discard the plan?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1045"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1052"/>
         <source>You are about to discard your plan.</source>
         <translation type="unfinished"/>
     </message>
@@ -1907,22 +2063,22 @@
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="257"/>
         <source>Dive planner points</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="261"/>
         <source>Available gases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="284"/>
         <source>Add dive data point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="304"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="293"/>
         <source>Save new</source>
         <translation type="unfinished"/>
     </message>
@@ -1930,92 +2086,112 @@
 <context>
     <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Depth</source>
         <translation>Mélység</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
         <source>Time</source>
         <translation>Idő</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
         <source>Pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
         <source>Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
         <source>Pressure S</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
         <source>pN₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
         <source>pHe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
         <source>pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
+        <source>Setpoint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
+        <source>Sensor1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
+        <source>Sensor2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
+        <source>Sensor3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
         <source>Ambient pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
-        <source>Heart Beat</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
+        <source>Heart beat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
-        <source>Gradient Factor</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/>
+        <source>Gradient factor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
-        <source>Mean Depth/s</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
+        <source>Mean depth/s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
         <source>Pressure I</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
         <source>User entered</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
         <source>Cylinder index</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
         <source>Ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
         <source>SAC</source>
         <translation type="unfinished"/>
     </message>
@@ -2066,127 +2242,127 @@
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1437"/>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1443"/>
+        <location filename="../qt-ui/models.cpp" line="1489"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1440"/>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1492"/>
         <source>Date</source>
         <translation>Dátum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1443"/>
-        <location filename="../qt-ui/models.cpp" line="1489"/>
+        <location filename="../qt-ui/models.cpp" line="1449"/>
+        <location filename="../qt-ui/models.cpp" line="1495"/>
         <source>Rating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1452"/>
         <source>Depth</source>
         <translation>Mélység</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1458"/>
         <source>Temp</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1461"/>
         <source>Weight</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1458"/>
-        <location filename="../qt-ui/models.cpp" line="1504"/>
+        <location filename="../qt-ui/models.cpp" line="1464"/>
+        <location filename="../qt-ui/models.cpp" line="1510"/>
         <source>Suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1461"/>
-        <location filename="../qt-ui/models.cpp" line="1507"/>
+        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1513"/>
         <source>Cyl</source>
         <translation>Pal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1464"/>
-        <location filename="../qt-ui/models.cpp" line="1510"/>
+        <location filename="../qt-ui/models.cpp" line="1470"/>
+        <location filename="../qt-ui/models.cpp" line="1516"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1473"/>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1527"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
-        <location filename="../qt-ui/models.cpp" line="1524"/>
+        <location filename="../qt-ui/models.cpp" line="1482"/>
+        <location filename="../qt-ui/models.cpp" line="1530"/>
         <source>Location</source>
         <translation>Hely</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>kg</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1449"/>
-        <location filename="../qt-ui/models.cpp" line="1495"/>
+        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1501"/>
         <source>Duration</source>
         <translation>Tartam</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1498"/>
+        <location filename="../qt-ui/models.cpp" line="1504"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>lbs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1470"/>
-        <location filename="../qt-ui/models.cpp" line="1518"/>
+        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1524"/>
         <source>OTU</source>
         <translation type="unfinished"/>
     </message>
@@ -2194,94 +2370,94 @@
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="98"/>
         <source>no dives were selected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="117"/>
         <source>failed to create zip file for upload: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="143"/>
         <source>cannot create temporary file: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/>
         <source>internal error: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="169"/>
         <source>internal error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="629"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="828"/>
         <source>Done</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/>
         <source>Uploading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="692"/>
         <source>Downloading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="741"/>
         <source>Downloading %1 dives...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="785"/>
         <source>Download finished - %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="802"/>
         <source>Corrupted download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>The archive could not be opened:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
         <source>Upload failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/>
         <source>Upload successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
         <source>Login failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
         <source>Cannot parse response</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
         <source>Error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="829"/>
         <source>Upload finished</source>
         <translation type="unfinished"/>
     </message>
@@ -2289,54 +2465,52 @@
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
-        <source>OK</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="169"/>
         <source>Error</source>
         <translation>Hiba</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="400"/>
         <source>Retry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="264"/>
         <source>Find Uemis dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Log files (*.log)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="362"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="363"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="374"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="375"/>
         <source>Dump files (*.bin)</source>
         <translation type="unfinished"/>
     </message>
@@ -2344,7 +2518,7 @@
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="101"/>
         <source>Vendor</source>
         <translation type="unfinished"/>
     </message>
@@ -2354,54 +2528,74 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="31"/>
         <source>Device or mount point</source>
         <translation>Eszköz vagy csatolási pont</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="111"/>
         <source>Dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="132"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="45"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="80"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="94"/>
         <source>...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="52"/>
         <source>Force download of all dives</source>
         <translation>Minden merülés kényszer letöltése</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
         <source>Always prefer downloaded dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="189"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/>
+        <source>Downloaded Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
+        <source>Select all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
+        <source>Unselect all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
         <source>Save libdivecomputer logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="87"/>
         <source>Save libdivecomputer dumpfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
         <source>Download into new trip</source>
         <translation type="unfinished"/>
     </message>
@@ -2409,12 +2603,12 @@
 <context>
     <name>ExtraDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Value</source>
         <translation type="unfinished"/>
     </message>
@@ -2428,21 +2622,21 @@
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="245"/>
-        <source>Your dive profile was updated to facebook.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
-        <source>Photo Upload Failed</source>
+        <source>Your dive profile was updated to Facebook.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="250"/>
-        <source>Your dive profile was not updated to facebook, 
+        <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+        <source>Photo Upload Failed</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>FilterWidget</name>
@@ -2483,17 +2677,17 @@
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1544"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1621"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1624"/>
         <source>Firmware update failed!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1550"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1627"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -2501,7 +2695,7 @@
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="128"/>
+        <location filename="../qt-ui/globe.cpp" line="119"/>
         <source>Edit selected dive locations</source>
         <translation type="unfinished"/>
     </message>
@@ -2509,7 +2703,7 @@
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="566"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="549"/>
         <source>Location: </source>
         <translation type="unfinished"/>
     </message>
@@ -2517,7 +2711,7 @@
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="286"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="283"/>
         <source>No location set</source>
         <translation type="unfinished"/>
     </message>
@@ -2525,347 +2719,352 @@
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="133"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
+        <location filename="../qt-ui/maintab.cpp" line="497"/>
         <source>Location</source>
         <translation>Hely</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="67"/>
         <source>Coordinates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="169"/>
         <source>Divemaster</source>
         <translation>Merülés vezető</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="154"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Buddy</source>
         <translation>Társ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="222"/>
+        <location filename="../qt-ui/maintab.ui" line="277"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="186"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
         <source>Rating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="221"/>
         <source>Visibility</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="230"/>
         <source>Suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="465"/>
+        <location filename="../qt-ui/maintab.cpp" line="470"/>
         <source>Dive notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
-        <location filename="../qt-ui/maintab.ui" line="648"/>
-        <location filename="../qt-ui/maintab.cpp" line="277"/>
+        <location filename="../qt-ui/maintab.ui" line="74"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="102"/>
+        <location filename="../qt-ui/maintab.ui" line="677"/>
+        <location filename="../qt-ui/maintab.cpp" line="279"/>
         <source>Air temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <location filename="../qt-ui/maintab.ui" line="667"/>
-        <location filename="../qt-ui/maintab.cpp" line="278"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.ui" line="696"/>
+        <location filename="../qt-ui/maintab.cpp" line="280"/>
         <source>Water temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="229"/>
-        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.ui" line="284"/>
+        <location filename="../qt-ui/maintab.cpp" line="498"/>
         <source>Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="369"/>
+        <location filename="../qt-ui/maintab.ui" line="398"/>
         <source>Equipment</source>
         <translation>Felszerelés</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="496"/>
+        <location filename="../qt-ui/maintab.ui" line="525"/>
         <source>Gases used</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="515"/>
+        <location filename="../qt-ui/maintab.ui" line="544"/>
         <source>Gas consumed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="553"/>
+        <location filename="../qt-ui/maintab.ui" line="582"/>
         <source>CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="591"/>
+        <location filename="../qt-ui/maintab.ui" line="620"/>
         <source>Max. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="629"/>
+        <location filename="../qt-ui/maintab.ui" line="658"/>
         <source>Air pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="686"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>Dive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="845"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
         <source>Total time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="903"/>
+        <location filename="../qt-ui/maintab.ui" line="932"/>
         <source>Gas consumption</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="962"/>
+        <location filename="../qt-ui/maintab.ui" line="991"/>
         <source>Extra data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="968"/>
+        <location filename="../qt-ui/maintab.ui" line="997"/>
         <source>Additional data from dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="54"/>
-        <location filename="../qt-ui/maintab.ui" line="458"/>
+        <location filename="../qt-ui/maintab.ui" line="83"/>
+        <location filename="../qt-ui/maintab.ui" line="487"/>
         <source>Date</source>
         <translation>Dátum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="61"/>
+        <location filename="../qt-ui/maintab.ui" line="90"/>
         <source>Time</source>
         <translation>Idő</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="425"/>
+        <location filename="../qt-ui/maintab.ui" line="454"/>
         <source>Dive info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="477"/>
+        <location filename="../qt-ui/maintab.ui" line="506"/>
         <source>Interval</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="534"/>
-        <location filename="../qt-ui/maintab.ui" line="799"/>
+        <location filename="../qt-ui/maintab.ui" line="563"/>
+        <location filename="../qt-ui/maintab.ui" line="828"/>
         <source>SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="610"/>
+        <location filename="../qt-ui/maintab.ui" line="639"/>
         <source>Avg. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="572"/>
+        <location filename="../qt-ui/maintab.ui" line="601"/>
         <source>OTU</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="734"/>
         <source>Salinity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="742"/>
+        <location filename="../qt-ui/maintab.ui" line="771"/>
         <source>Stats</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="775"/>
+        <location filename="../qt-ui/maintab.ui" line="804"/>
         <source>Depth</source>
         <translation>Mélység</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="787"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="813"/>
+        <location filename="../qt-ui/maintab.ui" line="842"/>
         <source>Duration</source>
         <translation>Tartam</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="864"/>
+        <location filename="../qt-ui/maintab.ui" line="893"/>
         <source>Dives</source>
         <translation>Merülések</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="948"/>
+        <location filename="../qt-ui/maintab.ui" line="977"/>
         <source>Photos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="95"/>
+        <location filename="../qt-ui/maintab.cpp" line="87"/>
         <source>Cylinders</source>
         <translation>Palackok</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="99"/>
+        <location filename="../qt-ui/maintab.cpp" line="91"/>
         <source>Weights</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="55"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Apply changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="59"/>
+        <location filename="../qt-ui/maintab.cpp" line="50"/>
         <source>Discard changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="96"/>
+        <location filename="../qt-ui/maintab.cpp" line="88"/>
         <source>Add cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="100"/>
+        <location filename="../qt-ui/maintab.cpp" line="92"/>
         <source>Add weight system</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="274"/>
+        <location filename="../qt-ui/maintab.cpp" line="276"/>
         <source>Air temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="275"/>
+        <location filename="../qt-ui/maintab.cpp" line="277"/>
         <source>Water temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="312"/>
+        <location filename="../qt-ui/maintab.cpp" line="314"/>
         <source>This trip is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="320"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Multiple dives are being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.cpp" line="324"/>
         <source>This dive is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="436"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
+        <location filename="../qt-ui/maintab.cpp" line="465"/>
         <source>Trip notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="458"/>
+        <location filename="../qt-ui/maintab.cpp" line="463"/>
         <source>Trip location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="526"/>
-        <location filename="../qt-ui/maintab.cpp" line="558"/>
-        <location filename="../qt-ui/maintab.cpp" line="562"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
         <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="574"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="555"/>
+        <location filename="../qt-ui/maintab.cpp" line="563"/>
         <source>Deepest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="556"/>
+        <location filename="../qt-ui/maintab.cpp" line="564"/>
         <source>Shallowest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="569"/>
+        <location filename="../qt-ui/maintab.cpp" line="577"/>
         <source>Highest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="578"/>
         <source>Lowest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="571"/>
+        <location filename="../qt-ui/maintab.cpp" line="579"/>
         <source>Average total SAC of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="582"/>
+        <location filename="../qt-ui/maintab.cpp" line="590"/>
         <source>Highest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="583"/>
+        <location filename="../qt-ui/maintab.cpp" line="591"/>
         <source>Lowest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="584"/>
+        <location filename="../qt-ui/maintab.cpp" line="592"/>
         <source>Average temperature of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="594"/>
+        <location filename="../qt-ui/maintab.cpp" line="602"/>
         <source>Longest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="595"/>
+        <location filename="../qt-ui/maintab.cpp" line="603"/>
         <source>Shortest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="596"/>
+        <location filename="../qt-ui/maintab.cpp" line="604"/>
         <source>Average length of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="620"/>
+        <location filename="../qt-ui/maintab.cpp" line="628"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="624"/>
+        <location filename="../qt-ui/maintab.cpp" line="632"/>
         <source> and </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="911"/>
+        <location filename="../qt-ui/maintab.cpp" line="925"/>
         <source>Discard the changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="912"/>
+        <location filename="../qt-ui/maintab.cpp" line="926"/>
         <source>You are about to discard your changes.</source>
         <translation type="unfinished"/>
     </message>
@@ -3008,7 +3207,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="296"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="232"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
@@ -3368,90 +3567,90 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="252"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="229"/>
         <source>Open file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="256"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="233"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="332"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="309"/>
         <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="444"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
         <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="491"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
         <source>Print runtime table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="834"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="811"/>
         <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="836"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="813"/>
         <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="841"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="818"/>
         <source>Save changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1196"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1173"/>
         <source>Save file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1337"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1314"/>
         <source>Open dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="819"/>
         <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="300"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="444"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="277"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1180"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1157"/>
         <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="625"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="602"/>
         <source>Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1197"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1174"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1338"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1315"/>
         <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"/>
     </message>
@@ -3459,7 +3658,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="651"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="634"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation type="unfinished"/>
     </message>
@@ -3467,39 +3666,39 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="239"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="243"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="244"/>
         <source>Not now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="245"/>
         <source>Update firmware</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
         <source>Firmware upgrade notice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
         <source>Save the downloaded firmware as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
         <source>HEX files (*.hex)</source>
         <translation type="unfinished"/>
     </message>
@@ -3507,54 +3706,69 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Open circuit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>ft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="481"/>
         <source>Last stop at 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="482"/>
         <source>50% avg. depth to 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="489"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
         <source>20ft to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="485"/>
         <source>m/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
         <source>Last stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
         <source>50% avg. depth to 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="494"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
         <source>6m to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="497"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="498"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
         <source>cuft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="506"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="507"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="500"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="501"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
@@ -3673,6 +3887,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="816"/>
         <source>bar</source>
         <translation type="unfinished"/>
     </message>
@@ -3707,57 +3922,87 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="795"/>
+        <source>CCR: Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="809"/>
+        <source>Default CCR set-point for dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="832"/>
+        <source>pSCR O₂ metabolism rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="839"/>
+        <source>pSCR ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="846"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="859"/>
+        <source>1:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="875"/>
         <source>System default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="843"/>
+        <location filename="../qt-ui/preferences.ui" line="914"/>
         <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="849"/>
+        <location filename="../qt-ui/preferences.ui" line="920"/>
         <source>Proxy type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="862"/>
+        <location filename="../qt-ui/preferences.ui" line="933"/>
         <source>Host</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="888"/>
+        <location filename="../qt-ui/preferences.ui" line="959"/>
         <source>Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="914"/>
+        <location filename="../qt-ui/preferences.ui" line="985"/>
         <source>Requires authentication</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="934"/>
+        <location filename="../qt-ui/preferences.ui" line="1005"/>
         <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="957"/>
+        <location filename="../qt-ui/preferences.ui" line="1028"/>
         <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="985"/>
-        <source>about:blank</source>
+        <location filename="../qt-ui/preferences.ui" line="1079"/>
+        <source>Disconnect from Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1011"/>
-        <source>Disconnect from facebook</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="824"/>
+        <location filename="../qt-ui/preferences.ui" line="895"/>
         <source>Filter</source>
         <translation>Szűrő</translation>
     </message>
@@ -3912,52 +4157,52 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="28"/>
+        <location filename="../qt-ui/preferences.cpp" line="44"/>
         <source>No proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="29"/>
+        <location filename="../qt-ui/preferences.cpp" line="45"/>
         <source>System proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="30"/>
+        <location filename="../qt-ui/preferences.cpp" line="46"/>
         <source>HTTP proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="31"/>
+        <location filename="../qt-ui/preferences.cpp" line="47"/>
         <source>SOCKS proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="291"/>
+        <location filename="../qt-ui/preferences.cpp" line="324"/>
         <source>Restart required</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="292"/>
+        <location filename="../qt-ui/preferences.cpp" line="325"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="456"/>
+        <location filename="../qt-ui/preferences.cpp" line="494"/>
         <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Open default log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="455"/>
+        <location filename="../qt-ui/preferences.cpp" line="493"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
@@ -3965,17 +4210,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="91"/>
+        <location filename="../qt-ui/printdialog.cpp" line="85"/>
         <source>&amp;Preview</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="88"/>
+        <location filename="../qt-ui/printdialog.cpp" line="82"/>
         <source>P&amp;rint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="103"/>
+        <location filename="../qt-ui/printdialog.cpp" line="97"/>
         <source>Print</source>
         <translation type="unfinished"/>
     </message>
@@ -3983,42 +4228,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="20"/>
         <source>Dive#</source>
         <translation>Merülés#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="21"/>
         <source>Date</source>
         <translation>Dátum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="22"/>
         <source>Depth</source>
         <translation>Mélység</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="23"/>
         <source>Duration</source>
         <translation>Tartam</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Master</source>
         <translation>Vezető</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Buddy</source>
         <translation>Társ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="34"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Location</source>
         <translation>Hely</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <location filename="../qt-ui/printlayout.cpp" line="63"/>
         <source>Subsurface cannot find a usable printer on this system!</source>
         <translation type="unfinished"/>
     </message>
@@ -4084,72 +4329,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2095"/>
+        <location filename="../qt-ui/models.cpp" line="2101"/>
         <source>unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2100"/>
+        <location filename="../qt-ui/models.cpp" line="2106"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2103"/>
+        <location filename="../qt-ui/models.cpp" line="2109"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2110"/>
+        <location filename="../qt-ui/models.cpp" line="2116"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2115"/>
+        <location filename="../qt-ui/models.cpp" line="2121"/>
         <source>Gas used:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2117"/>
+        <location filename="../qt-ui/models.cpp" line="2123"/>
         <source>Tags:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2119"/>
+        <location filename="../qt-ui/models.cpp" line="2125"/>
         <source>SAC:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2121"/>
+        <location filename="../qt-ui/models.cpp" line="2127"/>
         <source>Weights:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2126"/>
+        <location filename="../qt-ui/models.cpp" line="2132"/>
         <source>Notes:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2133"/>
+        <location filename="../qt-ui/models.cpp" line="2139"/>
         <source>Divemaster:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2135"/>
+        <location filename="../qt-ui/models.cpp" line="2141"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2137"/>
+        <location filename="../qt-ui/models.cpp" line="2143"/>
         <source>Suit:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2139"/>
+        <location filename="../qt-ui/models.cpp" line="2145"/>
         <source>Viz:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2141"/>
+        <location filename="../qt-ui/models.cpp" line="2147"/>
         <source>Rating:</source>
         <translation type="unfinished"/>
     </message>
@@ -4157,103 +4402,108 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="628"/>
         <source> (#%1 of %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="630"/>
+        <source>Unknown dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="647"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1168"/>
         <source>Make first divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Delete this divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1184"/>
         <source>Add gas change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1187"/>
         <source> (Tank %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1195"/>
         <source>Add set-point change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1197"/>
         <source>Add bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
         <source>Remove event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1206"/>
         <source>Hide similar events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1213"/>
         <source>Edit name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1242"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1249"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1264"/>
         <source>Unhide all events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide all %1 events?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1333"/>
         <source>Remove the selected event?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1334"/>
         <source>%1 @ %2:%3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1424"/>
         <source>Edit name of bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
         <source>Custom name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1430"/>
         <source>Name is too long!</source>
         <translation type="unfinished"/>
     </message>
@@ -4261,102 +4511,102 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>AIR</source>
         <translation>LÉG</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>OXYGEN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="208"/>
         <source>Remove this point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="57"/>
         <source>Close</source>
         <translation>Bezárás</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="42"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="25"/>
         <source>Average</source>
         <translation>Átlag</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="45"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="28"/>
         <source>Minimum</source>
         <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="48"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="31"/>
         <source>Maximum</source>
         <translation>Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="297"/>
+        <location filename="../qt-ui/globe.cpp" line="296"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="525"/>
         <source>kg</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="526"/>
         <source>lbs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="550"/>
         <source>ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="551"/>
         <source>m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="570"/>
+        <location filename="../qt-ui/models.cpp" line="574"/>
         <source>psi</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="571"/>
+        <location filename="../qt-ui/models.cpp" line="575"/>
         <source>bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="595"/>
+        <location filename="../qt-ui/models.cpp" line="599"/>
         <source>l</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="596"/>
+        <location filename="../qt-ui/models.cpp" line="600"/>
         <source>cuft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="513"/>
         <source>Invalid response from server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="567"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation type="unfinished"/>
     </message>
@@ -4364,12 +4614,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1450"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1518"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1442"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -4383,12 +4633,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
-        <location filename="../qt-ui/simplewidgets.cpp" line="151"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="134"/>
         <source>New starting number</source>
         <translation>Új kezdő szám</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="149"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="132"/>
         <source>New number</source>
         <translation type="unfinished"/>
     </message>
@@ -4396,12 +4646,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1575"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1653"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1579"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1657"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -4480,12 +4730,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="276"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="259"/>
         <source>Open image file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="278"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="261"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation type="unfinished"/>
     </message>
@@ -4538,7 +4788,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <name>SocialNetworkDialog</name>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="282"/>
-        <source>Dive Date: %1 
+        <source>Dive date: %1 
 </source>
         <translation type="unfinished"/>
     </message>
@@ -4562,7 +4812,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="290"/>
-        <source>Dive Location: %1 
+        <source>Dive location: %1 
 </source>
         <translation type="unfinished"/>
     </message>
@@ -4679,47 +4929,47 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="329"/>
         <source>Webservice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="393"/>
         <source>Connecting...</source>
         <translation>Csatlakozás...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
         <source>Download finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Download error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="436"/>
         <source>Connection error: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
         <source>Download successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="439"/>
         <source>Invalid user identifier!</source>
         <translation>Érvénytelen felhasználó azonosító</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="312"/>
         <source>Enter User ID and click Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="442"/>
         <source>Cannot parse response!</source>
         <translation>Nem lehet feldolgozni választ!</translation>
     </message>
@@ -4727,7 +4977,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="592"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="575"/>
         <source>Suits: </source>
         <translation type="unfinished"/>
     </message>
@@ -4735,7 +4985,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="119"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="116"/>
         <source>No suit set</source>
         <translation type="unfinished"/>
     </message>
@@ -4752,7 +5002,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="513"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="496"/>
         <source>Tags: </source>
         <translation type="unfinished"/>
     </message>
@@ -4760,7 +5010,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="144"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="141"/>
         <source>Empty tags</source>
         <translation type="unfinished"/>
     </message>
@@ -4768,17 +5018,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>bar</source>
         <translation type="unfinished"/>
     </message>
@@ -4786,7 +5036,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="141"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="131"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
@@ -4794,7 +5044,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1090"/>
+        <location filename="../qt-ui/models.cpp" line="1094"/>
         <source> (%1 shown)</source>
         <translation type="unfinished"/>
     </message>
@@ -4802,72 +5052,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="64"/>
         <source>Check for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="66"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="70"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="72"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
         <source>Please check your internet connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="85"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="84"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="88"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="95"/>
         <source>A new version of Subsurface is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="97"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
         <source>Latest version is %1, please check with your OS vendor for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="103"/>
         <source>Newest release version is </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="105"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
         <source>The server returned the following information:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="121"/>
         <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
         <source>Decline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="124"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
         <source>Accept</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="126"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="125"/>
         <source>Automatic check for updates</source>
         <translation type="unfinished"/>
     </message>
@@ -4875,13 +5125,13 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UserManual</name>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="55"/>
+        <location filename="../qt-ui/usermanual.cpp" line="54"/>
         <source>User Manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="72"/>
-        <location filename="../qt-ui/usermanual.cpp" line="78"/>
+        <location filename="../qt-ui/usermanual.cpp" line="71"/>
+        <location filename="../qt-ui/usermanual.cpp" line="77"/>
         <source>Cannot find the Subsurface manual</source>
         <translation type="unfinished"/>
     </message>
@@ -4959,81 +5209,81 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
         <source>
 Operating System: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
         <source>
 CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 Language: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="93"/>
         <source>Should we ask you later?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Don&apos;t ask me again</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Ask later</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
         <source>Submit user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask again?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="17"/>
         <source>Send</source>
         <translation>Küldés</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="121"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>Please check your internet connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="131"/>
         <source>Survey successfully submitted.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="136"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation type="unfinished"/>
     </message>
@@ -5041,12 +5291,12 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>kg</source>
         <translation type="unfinished"/>
     </message>
@@ -5094,12 +5344,12 @@ OS CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="247"/>
         <source>Operation timed out</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="268"/>
         <source>Transferring data...</source>
         <translation type="unfinished"/>
     </message>
@@ -5107,17 +5357,17 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Weight</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="496"/>
+        <location filename="../qt-ui/models.cpp" line="500"/>
         <source>Clicking here will remove this weight system.</source>
         <translation type="unfinished"/>
     </message>
@@ -5125,19 +5375,19 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1479"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1487"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1497"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1555"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1566"/>
         <source>Failed!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1506"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1576"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1580"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -5145,70 +5395,70 @@ OS CPU Architecture: %1</source>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1841"/>
+        <location filename="../qt-ui/models.cpp" line="1847"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1844"/>
+        <location filename="../qt-ui/models.cpp" line="1850"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1847"/>
+        <location filename="../qt-ui/models.cpp" line="1853"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1850"/>
+        <location filename="../qt-ui/models.cpp" line="1856"/>
         <source>
 Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1853"/>
+        <location filename="../qt-ui/models.cpp" line="1859"/>
         <source>
 Shortest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1856"/>
+        <location filename="../qt-ui/models.cpp" line="1862"/>
         <source>
 Longest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1859"/>
+        <location filename="../qt-ui/models.cpp" line="1865"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1862"/>
-        <location filename="../qt-ui/models.cpp" line="1871"/>
-        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>
 Minimum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1865"/>
-        <location filename="../qt-ui/models.cpp" line="1874"/>
-        <location filename="../qt-ui/models.cpp" line="1883"/>
+        <location filename="../qt-ui/models.cpp" line="1871"/>
+        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>
 Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1874"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1883"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"/>
@@ -5288,40 +5538,40 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="1508"/>
+        <location filename="../dive.c" line="1530"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) vagy (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="464"/>
+        <location filename="../divelist.c" line="467"/>
         <location filename="../equipment.c" line="81"/>
-        <location filename="../planner.c" line="1060"/>
-        <location filename="../planner.c" line="1063"/>
+        <location filename="../planner.c" line="1081"/>
+        <location filename="../planner.c" line="1084"/>
         <source>air</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../equipment.c" line="192"/>
+        <location filename="../equipment.c" line="194"/>
         <source>integrated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../equipment.c" line="193"/>
+        <location filename="../equipment.c" line="195"/>
         <source>belt</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../equipment.c" line="194"/>
+        <location filename="../equipment.c" line="196"/>
         <source>ankle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../equipment.c" line="195"/>
+        <location filename="../equipment.c" line="197"/>
         <source>backplate weight</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../equipment.c" line="196"/>
+        <location filename="../equipment.c" line="198"/>
         <source>clip-on</source>
         <translation type="unfinished"/>
     </message>
@@ -5329,7 +5579,7 @@ Maximum</source>
         <location filename="../file.c" line="112"/>
         <location filename="../file.c" line="434"/>
         <location filename="../file.c" line="506"/>
-        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="925"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>&apos;%s&apos; olvasása meghiúsult.</translation>
     </message>
@@ -5386,9 +5636,9 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../file.c" line="869"/>
-        <location filename="../file.c" line="909"/>
-        <location filename="../file.c" line="1007"/>
+        <location filename="../file.c" line="870"/>
+        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="1016"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation type="unfinished"/>
     </message>
@@ -5559,27 +5809,27 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="421"/>
+        <location filename="../libdivecomputer.c" line="419"/>
         <source>Unable to create parser for %s %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="427"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Error registering the data</source>
         <translation>Hiba az adat regisztrálása alatt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="433"/>
         <source>Error parsing the datetime</source>
         <translation>Hiba a dátumidő feldolgozása alatt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Dive %d: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="455"/>
+        <location filename="../libdivecomputer.c" line="454"/>
         <source>Error parsing the divetime</source>
         <translation>Hiba a merülési idő feldolgozása alatt</translation>
     </message>
@@ -5589,155 +5839,155 @@ Maximum</source>
         <translation>Hiba a max mélység feldolgozása alatt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="482"/>
+        <location filename="../libdivecomputer.c" line="483"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="501"/>
+        <location filename="../libdivecomputer.c" line="503"/>
         <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="513"/>
+        <location filename="../libdivecomputer.c" line="515"/>
         <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="521"/>
+        <location filename="../libdivecomputer.c" line="524"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="545"/>
+        <location filename="../libdivecomputer.c" line="549"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="562"/>
+        <location filename="../libdivecomputer.c" line="569"/>
         <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="569"/>
+        <location filename="../libdivecomputer.c" line="576"/>
         <source>Error parsing the samples</source>
         <translation>Hiba a minták feldolgozása alatt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="706"/>
+        <location filename="../libdivecomputer.c" line="713"/>
         <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="714"/>
+        <location filename="../libdivecomputer.c" line="721"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="778"/>
+        <location filename="../libdivecomputer.c" line="785"/>
         <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="783"/>
+        <location filename="../libdivecomputer.c" line="790"/>
         <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="804"/>
+        <location filename="../libdivecomputer.c" line="811"/>
         <source>Dive data import error</source>
         <translation>Merülési adat importálási hiba</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="843"/>
+        <location filename="../libdivecomputer.c" line="850"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="850"/>
+        <location filename="../libdivecomputer.c" line="857"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="858"/>
+        <location filename="../libdivecomputer.c" line="865"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="506"/>
+        <location filename="../parse-xml.c" line="516"/>
         <source>Strange percentage reading %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1760"/>
+        <location filename="../parse-xml.c" line="1770"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>&apos;%s&apos; értelmezése meghiúsult.</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1989"/>
-        <location filename="../parse-xml.c" line="2137"/>
+        <location filename="../parse-xml.c" line="1999"/>
+        <location filename="../parse-xml.c" line="2147"/>
         <source>Database query dm4_events failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1996"/>
-        <location filename="../parse-xml.c" line="2144"/>
+        <location filename="../parse-xml.c" line="2006"/>
+        <location filename="../parse-xml.c" line="2154"/>
         <source>Database query dm4_tags failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2318"/>
+        <location filename="../parse-xml.c" line="2328"/>
         <source>Database query shearwater_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2325"/>
+        <location filename="../parse-xml.c" line="2335"/>
         <source>Database query shearwater_changes failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2332"/>
+        <location filename="../parse-xml.c" line="2342"/>
         <source>Database query shearwater_profile_sample failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2451"/>
+        <location filename="../parse-xml.c" line="2461"/>
         <source>Database query cobalt_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2458"/>
+        <location filename="../parse-xml.c" line="2468"/>
         <source>Database query cobalt_buddies failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2465"/>
+        <location filename="../parse-xml.c" line="2475"/>
         <source>Database query cobalt_visibility failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2472"/>
+        <location filename="../parse-xml.c" line="2482"/>
         <source>Database query cobalt_location failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2479"/>
+        <location filename="../parse-xml.c" line="2489"/>
         <source>Database query cobalt_location (site) failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2486"/>
+        <location filename="../parse-xml.c" line="2496"/>
         <source>Database query cobalt_profile_sample failed.
 </source>
         <translation type="unfinished"/>
@@ -5749,16 +5999,16 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2168"/>
-        <location filename="../parse-xml.c" line="2189"/>
-        <location filename="../parse-xml.c" line="2508"/>
-        <location filename="../parse-xml.c" line="2527"/>
+        <location filename="../parse-xml.c" line="2178"/>
+        <location filename="../parse-xml.c" line="2199"/>
+        <location filename="../parse-xml.c" line="2518"/>
+        <location filename="../parse-xml.c" line="2537"/>
         <source>Database query failed '%s'.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2848"/>
+        <location filename="../parse-xml.c" line="2909"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation type="unfinished"/>
     </message>
@@ -5768,361 +6018,367 @@ Maximum</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="820"/>
+        <location filename="../planner.c" line="841"/>
         <source>Can&apos;t find gas %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="356"/>
+        <location filename="../planner.c" line="363"/>
         <source>Too many gas mixes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="540"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="548"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="544"/>
+        <location filename="../planner.c" line="551"/>
         <source>Subsurface dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="548"/>
+        <location filename="../planner.c" line="555"/>
         <source>depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="558"/>
         <source>runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="554"/>
+        <location filename="../planner.c" line="561"/>
         <source>duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="557"/>
+        <location filename="../planner.c" line="564"/>
         <source>gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="594"/>
+        <location filename="../planner.c" line="601"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="602"/>
+        <location filename="../planner.c" line="609"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="615"/>
+        <location filename="../planner.c" line="622"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="622"/>
+        <location filename="../planner.c" line="629"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="635"/>
+        <location filename="../planner.c" line="642"/>
         <source>%3.0f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="638"/>
-        <location filename="../planner.c" line="642"/>
+        <location filename="../planner.c" line="645"/>
+        <location filename="../planner.c" line="649"/>
         <source>%3dmin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="651"/>
+        <location filename="../planner.c" line="658"/>
         <source>(SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="676"/>
+        <location filename="../planner.c" line="683"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="678"/>
+        <location filename="../planner.c" line="685"/>
         <source>Switch gas to %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="697"/>
+        <location filename="../planner.c" line="704"/>
         <source>CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="699"/>
+        <location filename="../planner.c" line="706"/>
         <source>OTU</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="710"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="705"/>
+        <location filename="../planner.c" line="712"/>
         <source>Gas consumption:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="535"/>
-        <location filename="../planner.c" line="725"/>
-        <location filename="../planner.c" line="730"/>
-        <location filename="../planner.c" line="753"/>
+        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="732"/>
+        <location filename="../planner.c" line="737"/>
+        <location filename="../planner.c" line="762"/>
+        <location filename="../planner.c" line="772"/>
         <source>Warning:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="523"/>
+        <location filename="../planner.c" line="530"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="726"/>
+        <location filename="../planner.c" line="733"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="731"/>
+        <location filename="../planner.c" line="738"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="733"/>
+        <location filename="../planner.c" line="740"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="735"/>
+        <location filename="../planner.c" line="742"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="759"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="1064"/>
+        <location filename="../planner.c" line="769"/>
+        <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="1085"/>
         <source>ean</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1099"/>
+        <location filename="../profile.c" line="1113"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1102"/>
+        <location filename="../profile.c" line="1116"/>
         <source>P: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1106"/>
+        <location filename="../profile.c" line="1120"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1112"/>
+        <location filename="../profile.c" line="1126"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1115"/>
+        <location filename="../profile.c" line="1129"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1117"/>
+        <location filename="../profile.c" line="1131"/>
         <source>CNS: %u%%
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1119"/>
+        <location filename="../profile.c" line="1133"/>
         <source>pO%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1121"/>
+        <location filename="../profile.c" line="1135"/>
         <source>pN%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1123"/>
+        <location filename="../profile.c" line="1137"/>
         <source>pHe: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1140"/>
         <source>MOD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1147"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1137"/>
+        <location filename="../profile.c" line="1151"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1149"/>
+        <location filename="../profile.c" line="1163"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1152"/>
+        <location filename="../profile.c" line="1166"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1157"/>
+        <location filename="../profile.c" line="1171"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1174"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1178"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1166"/>
+        <location filename="../profile.c" line="1180"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1183"/>
         <source>TTS: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1172"/>
+        <location filename="../profile.c" line="1186"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1180"/>
+        <location filename="../profile.c" line="1194"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1196"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1185"/>
+        <location filename="../profile.c" line="1199"/>
         <source>TTS: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1188"/>
+        <location filename="../profile.c" line="1202"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1194"/>
+        <location filename="../profile.c" line="1208"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1214"/>
         <source>heartbeat: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1202"/>
+        <location filename="../profile.c" line="1216"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1205"/>
+        <location filename="../profile.c" line="1219"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1314"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1304"/>
-        <location filename="../profile.c" line="1308"/>
-        <location filename="../profile.c" line="1312"/>
+        <location filename="../profile.c" line="1318"/>
+        <location filename="../profile.c" line="1322"/>
+        <location filename="../profile.c" line="1326"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1316"/>
+        <location filename="../profile.c" line="1330"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1334"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1324"/>
-        <location filename="../profile.c" line="1328"/>
+        <location filename="../profile.c" line="1338"/>
+        <location filename="../profile.c" line="1342"/>
         <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1335"/>
+        <location filename="../profile.c" line="1349"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
@@ -6253,6 +6509,7 @@ EADD: %d%s
     </message>
     <message>
         <location filename="../dive.c" line="30"/>
+        <location filename="../equipment.c" line="85"/>
         <source>oxygen</source>
         <translation type="unfinished"/>
     </message>
@@ -6307,97 +6564,97 @@ EADD: %d%s
         <translation>(nincs merülés)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sun</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Mon</source>
         <translation>H</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Tue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Wed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Thu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Fri</source>
         <translation>P</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Mar</source>
         <translation>Már</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Apr</source>
         <translation>Ápr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>May</source>
         <translation>Máj</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jun</source>
         <translation>Jún</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Jul</source>
         <translation>Júl</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Sep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Oct</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Nov</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Dec</source>
         <translation>Dec</translation>
     </message>
@@ -6996,13 +7253,13 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
         <source>GF low</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>%</source>
         <translation type="unfinished"/>
     </message>
@@ -7012,7 +7269,7 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="335"/>
         <source>Drop to first depth</source>
         <translation type="unfinished"/>
     </message>
@@ -7022,69 +7279,69 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
         <source>Plan backgas breaks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="355"/>
         <source>Gas options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="376"/>
         <source>Bottom SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="383"/>
         <source>Deco SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="380"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="390"/>
         <source>Bottom pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="403"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="413"/>
         <source>Deco pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="449"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="462"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="478"/>
         <source>Dive notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
         <source>Display runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <source>Display segment duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="531"/>
         <source>Display transitions in deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="538"/>
         <source>Verbatim dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="387"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="410"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="397"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="420"/>
         <source>bar</source>
         <translation type="unfinished"/>
     </message>
@@ -7104,17 +7361,17 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="499"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="515"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/subsurface_id.ts b/translations/subsurface_id.ts
index 237862d47..b3e945a3f 100644
--- a/translations/subsurface_id.ts
+++ b/translations/subsurface_id.ts
@@ -3,12 +3,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="539"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="522"/>
         <source>Person: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="540"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="523"/>
         <source>Searches for buddies and divemasters</source>
         <translation type="unfinished"/>
     </message>
@@ -16,40 +16,188 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="233"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="230"/>
         <source>No buddies</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>ColumnNameProvider</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>GPS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Avg depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="210"/>
+        <location filename="../configuredivecomputer.cpp" line="212"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation>Tidak dapat menyimpan berkas cadangan %1. Pesan Kegagalan: %2</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="226"/>
+        <location filename="../configuredivecomputer.cpp" line="228"/>
         <source>Could not open backup file: %1</source>
         <translation>Tidak dapat membuka berkas cadangan: %1</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="542"/>
+        <location filename="../configuredivecomputer.cpp" line="552"/>
         <source>Dive computer details read successfully</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="551"/>
+        <location filename="../configuredivecomputer.cpp" line="561"/>
         <source>Setting successfully written to device</source>
         <translation>Penataan berhasil ditulis ke perangkat</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="560"/>
+        <location filename="../configuredivecomputer.cpp" line="570"/>
         <source>Device firmware successfully updated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="569"/>
+        <location filename="../configuredivecomputer.cpp" line="579"/>
         <source>Device settings successfully reset</source>
         <translation type="unfinished"/>
     </message>
@@ -847,70 +995,70 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1053"/>
         <source>Backup files (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1037"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1040"/>
         <source>Backup succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1041"/>
         <source>Your settings have been saved to: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1030"/>
         <source>Backup dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1036"/>
         <source>XML backup error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1052"/>
         <source>Restore dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1056"/>
         <source>XML restore error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1057"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1063"/>
         <source>Restore succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1064"/>
         <source>Your settings have been restored successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1074"/>
         <source>Select firmware file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1075"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -968,12 +1116,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="410"/>
         <source>Cylinder cannot be removed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="407"/>
+        <location filename="../qt-ui/models.cpp" line="411"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation type="unfinished"/>
     </message>
@@ -1049,12 +1197,12 @@
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="48"/>
         <source>Remove the selected dive computer?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="49"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
         <translation>Anda yakin ingin melepas Perangkat berikut?</translation>
@@ -1068,22 +1216,22 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Model</source>
         <translation>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Device ID</source>
         <translation>ID Perangkat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Nickname</source>
         <translation>Nama Panggilan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -1091,117 +1239,145 @@
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="115"/>
         <source>Bailing out to OC</source>
         <translation>Bailing out untuk OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="117"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>Mulai</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>Akhir</translation>
     </message>
 </context>
 <context>
+    <name>DiveImportedModel</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="556"/>
+        <source>Date/time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
+        <source>Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>h:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>min</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1242"/>
+        <location filename="../qt-ui/models.cpp" line="1248"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1245"/>
+        <location filename="../qt-ui/models.cpp" line="1251"/>
         <source>Date</source>
         <translation>Tanggal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1248"/>
+        <location filename="../qt-ui/models.cpp" line="1254"/>
         <source>Rating</source>
         <translation>Peringkat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1254"/>
+        <location filename="../qt-ui/models.cpp" line="1260"/>
         <source>Duration</source>
         <translation>Durasi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1263"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>kg</source>
         <translation>kgkg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1263"/>
+        <location filename="../qt-ui/models.cpp" line="1269"/>
         <source>Suit</source>
         <translation>Pakaian</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1266"/>
+        <location filename="../qt-ui/models.cpp" line="1272"/>
         <source>Cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1269"/>
+        <location filename="../qt-ui/models.cpp" line="1275"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>/min</source>
         <translation>/menit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1277"/>
+        <location filename="../qt-ui/models.cpp" line="1283"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1280"/>
+        <location filename="../qt-ui/models.cpp" line="1286"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1283"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>Location</source>
         <translation>Lokasi</translation>
     </message>
@@ -1209,87 +1385,87 @@
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="787"/>
+        <location filename="../qt-ui/divelistview.cpp" line="768"/>
         <source>Expand all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="788"/>
+        <location filename="../qt-ui/divelistview.cpp" line="769"/>
         <source>Collapse all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="789"/>
+        <location filename="../qt-ui/divelistview.cpp" line="770"/>
         <source>Collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="791"/>
+        <location filename="../qt-ui/divelistview.cpp" line="772"/>
         <source>Remove dive(s) from trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="792"/>
+        <location filename="../qt-ui/divelistview.cpp" line="773"/>
         <source>Create new trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="806"/>
+        <location filename="../qt-ui/divelistview.cpp" line="787"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="808"/>
+        <location filename="../qt-ui/divelistview.cpp" line="789"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="812"/>
+        <location filename="../qt-ui/divelistview.cpp" line="793"/>
         <source>Merge trip with trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="813"/>
+        <location filename="../qt-ui/divelistview.cpp" line="794"/>
         <source>Merge trip with trip below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="817"/>
+        <location filename="../qt-ui/divelistview.cpp" line="798"/>
         <source>Delete dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="819"/>
+        <location filename="../qt-ui/divelistview.cpp" line="800"/>
         <source>Mark dive(s) invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="823"/>
+        <location filename="../qt-ui/divelistview.cpp" line="804"/>
         <source>Merge selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="825"/>
+        <location filename="../qt-ui/divelistview.cpp" line="806"/>
         <source>Renumber dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="826"/>
+        <location filename="../qt-ui/divelistview.cpp" line="807"/>
         <source>Shift times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="827"/>
+        <location filename="../qt-ui/divelistview.cpp" line="808"/>
         <source>Load images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Open image files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation type="unfinished"/>
     </message>
@@ -1474,100 +1650,100 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="268"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="68"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
         <source>Subsurface native XML format.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
         <source>Write depths of images to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export UDDF file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="267"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
         <source>Export CSV file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="278"/>
         <source>Export world map</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="299"/>
         <source>HTML files (*.html)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="283"/>
         <source>Export Subsurface XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="284"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
         <source>Save image depths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="298"/>
         <source>Export HTML files as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
         <source>Can&apos;t open file %s</source>
         <translation type="unfinished"/>
     </message>
@@ -1580,247 +1756,227 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
-        <source>CSV options</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="281"/>
-        <source>Pre-configured imports</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="122"/>
-        <source>Depth</source>
-        <translation>edalaman</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="142"/>
-        <source>Stopdepth</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
+        <source>Time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="162"/>
-        <source>Pressure</source>
-        <translation>Tekanan</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="97"/>
+        <source>Metric</source>
+        <translation>Metrik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="176"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="466"/>
-        <source>Time</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="102"/>
+        <source>Imperial</source>
+        <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="183"/>
-        <source>Temp</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="59"/>
+        <source>dd.mm.yyyy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="213"/>
-        <source>NDL</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="64"/>
+        <source>mm/dd/yyyy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="233"/>
-        <source>TTS</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="69"/>
+        <source>yyyy-mm-dd</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="253"/>
-        <source>Cns</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
+        <source>Drag the tags above to each corresponding column below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="58"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="789"/>
-        <source>Field separator</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+        <source>Dive #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="35"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="363"/>
-        <source>Units</source>
-        <translation>Satuan</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="42"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="370"/>
-        <source>Metric</source>
-        <translation>Metrik</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+        <source>Date</source>
+        <translation>Tanggal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="47"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="375"/>
-        <source>Imperial</source>
-        <translation>Imperial</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+        <source>Duration</source>
+        <translation>Durasi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="169"/>
-        <source>pO₂</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+        <source>GPS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="298"/>
-        <source>Manual dives</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+        <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="316"/>
-        <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+        <source>O₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="319"/>
-        <source>Date format</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+        <source>He</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="332"/>
-        <source>dd.mm.yyyy</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="78"/>
+        <source>Seconds</source>
+        <translation>Detik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="337"/>
-        <source>mm/dd/yyyy</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
+        <source>Minutes</source>
+        <translation>Menit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="342"/>
-        <source>yyyy-mm-dd</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="88"/>
+        <source>Minutes:seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="392"/>
-        <source>Dive #</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+        <source>Location</source>
+        <translation>Lokasi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="426"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="439"/>
-        <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+        <source>Max depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="429"/>
-        <source>Date</source>
-        <translation>Tanggal</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="500"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="513"/>
-        <source>Dive duration in seconds or in min:sec format</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+        <source>Tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="503"/>
-        <source>Duration</source>
-        <translation>Durasi</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="574"/>
-        <source>GPS</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+        <source>Sample time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="591"/>
-        <source>Tags</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+        <source>Sample depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="608"/>
-        <source>Cyl size</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+        <source>Sample temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="625"/>
-        <source>Air temp</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+        <source>Sample po2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="642"/>
-        <source>Start Pressure</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+        <source>Sample cns</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="659"/>
-        <source>Water temp</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+        <source>Sample ndl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="676"/>
-        <source>End Press</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+        <source>Sample tts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="693"/>
-        <source>O₂</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+        <source>Sample stopdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="710"/>
-        <source>He</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+        <source>Samples pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="742"/>
-        <source>Choose duration format.</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+        <source>Sample pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="745"/>
-        <source>Duration format</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+        <source>Mean depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="758"/>
-        <source>Seconds</source>
-        <translation>Detik</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="763"/>
-        <source>Minutes</source>
-        <translation>Menit</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+        <source>Buddy</source>
+        <translation>Rekan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="768"/>
-        <source>Minutes:seconds</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+        <source>Notes</source>
+        <translation>Catatan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="540"/>
-        <source>Location</source>
-        <translation>Lokasi</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+        <source>Weight</source>
+        <translation>Berat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="409"/>
-        <source>Max depth</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+        <source>Cyl. size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="386"/>
-        <source>Field configuration</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+        <source>Start pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="449"/>
-        <source>Mean depth</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+        <source>End pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="483"/>
-        <source>Buddy</source>
-        <translation>Rekan</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="523"/>
-        <source>Notes</source>
-        <translation>Catatan</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="557"/>
-        <source>Weight</source>
-        <translation>Berat</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1864,42 +2020,42 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
         <source>unknown</source>
         <translation>Tak dikenal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="691"/>
         <source>Final depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="693"/>
         <source>Run time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="701"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="695"/>
         <source>Duration</source>
         <translation>Durasi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="703"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
         <source>Used gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="705"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
         <source>CC set point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1044"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1051"/>
         <source>Discard the plan?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1045"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1052"/>
         <source>You are about to discard your plan.</source>
         <translation>Kamu hendak mengabaikan Rencana</translation>
     </message>
@@ -1907,22 +2063,22 @@
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="257"/>
         <source>Dive planner points</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="261"/>
         <source>Available gases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="284"/>
         <source>Add dive data point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="304"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="293"/>
         <source>Save new</source>
         <translation type="unfinished"/>
     </message>
@@ -1930,92 +2086,112 @@
 <context>
     <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Depth</source>
         <translation>edalaman</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
         <source>Time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
         <source>Pressure</source>
         <translation>Tekanan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>Temperature</source>
         <translation>Suhu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
         <source>Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
         <source>Pressure S</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
         <source>pN₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
         <source>pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
+        <source>Setpoint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
+        <source>Sensor1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
+        <source>Sensor2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
+        <source>Sensor3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
         <source>Ambient pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
-        <source>Heart Beat</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
+        <source>Heart beat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
-        <source>Gradient Factor</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/>
+        <source>Gradient factor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
-        <source>Mean Depth/s</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
+        <source>Mean depth/s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
         <source>Pressure I</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
         <source>User entered</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
         <source>Cylinder index</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
         <source>Ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
@@ -2066,127 +2242,127 @@
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1437"/>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1443"/>
+        <location filename="../qt-ui/models.cpp" line="1489"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1440"/>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1492"/>
         <source>Date</source>
         <translation>Tanggal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1443"/>
-        <location filename="../qt-ui/models.cpp" line="1489"/>
+        <location filename="../qt-ui/models.cpp" line="1449"/>
+        <location filename="../qt-ui/models.cpp" line="1495"/>
         <source>Rating</source>
         <translation>Peringkat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1452"/>
         <source>Depth</source>
         <translation>edalaman</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1458"/>
         <source>Temp</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1461"/>
         <source>Weight</source>
         <translation>Berat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1458"/>
-        <location filename="../qt-ui/models.cpp" line="1504"/>
+        <location filename="../qt-ui/models.cpp" line="1464"/>
+        <location filename="../qt-ui/models.cpp" line="1510"/>
         <source>Suit</source>
         <translation>Pakaian</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1461"/>
-        <location filename="../qt-ui/models.cpp" line="1507"/>
+        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1513"/>
         <source>Cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1464"/>
-        <location filename="../qt-ui/models.cpp" line="1510"/>
+        <location filename="../qt-ui/models.cpp" line="1470"/>
+        <location filename="../qt-ui/models.cpp" line="1516"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>/min</source>
         <translation>/menit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1473"/>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1527"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
-        <location filename="../qt-ui/models.cpp" line="1524"/>
+        <location filename="../qt-ui/models.cpp" line="1482"/>
+        <location filename="../qt-ui/models.cpp" line="1530"/>
         <source>Location</source>
         <translation>Lokasi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1449"/>
-        <location filename="../qt-ui/models.cpp" line="1495"/>
+        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1501"/>
         <source>Duration</source>
         <translation>Durasi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1498"/>
+        <location filename="../qt-ui/models.cpp" line="1504"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1470"/>
-        <location filename="../qt-ui/models.cpp" line="1518"/>
+        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1524"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -2194,94 +2370,94 @@
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="98"/>
         <source>no dives were selected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="117"/>
         <source>failed to create zip file for upload: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="143"/>
         <source>cannot create temporary file: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/>
         <source>internal error: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="169"/>
         <source>internal error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="629"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="828"/>
         <source>Done</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/>
         <source>Uploading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="692"/>
         <source>Downloading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="741"/>
         <source>Downloading %1 dives...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="785"/>
         <source>Download finished - %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="802"/>
         <source>Corrupted download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>The archive could not be opened:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
         <source>Upload failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/>
         <source>Upload successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
         <source>Login failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
         <source>Cannot parse response</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
         <source>Error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="829"/>
         <source>Upload finished</source>
         <translation type="unfinished"/>
     </message>
@@ -2289,54 +2465,52 @@
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="169"/>
         <source>Error</source>
         <translation>Kesalahan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="400"/>
         <source>Retry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="264"/>
         <source>Find Uemis dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Log files (*.log)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="362"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="363"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="374"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="375"/>
         <source>Dump files (*.bin)</source>
         <translation type="unfinished"/>
     </message>
@@ -2344,7 +2518,7 @@
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="101"/>
         <source>Vendor</source>
         <translation>Vendor</translation>
     </message>
@@ -2354,54 +2528,74 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="31"/>
         <source>Device or mount point</source>
         <translation>Perangkat atau letak penempelan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="111"/>
         <source>Dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="132"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="45"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="80"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="94"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="52"/>
         <source>Force download of all dives</source>
         <translation>Paksa unduh keseluruhan selam</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
         <source>Always prefer downloaded dives</source>
         <translation>Selalu pilih selam yang sudah diunduh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="189"/>
         <source>Cancel</source>
         <translation>Batal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/>
+        <source>Downloaded Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
+        <source>Select all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
+        <source>Unselect all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
         <source>Save libdivecomputer logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="87"/>
         <source>Save libdivecomputer dumpfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
         <source>Download into new trip</source>
         <translation type="unfinished"/>
     </message>
@@ -2409,12 +2603,12 @@
 <context>
     <name>ExtraDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Value</source>
         <translation type="unfinished"/>
     </message>
@@ -2428,21 +2622,21 @@
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="245"/>
-        <source>Your dive profile was updated to facebook.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
-        <source>Photo Upload Failed</source>
+        <source>Your dive profile was updated to Facebook.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="250"/>
-        <source>Your dive profile was not updated to facebook, 
+        <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+        <source>Photo Upload Failed</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>FilterWidget</name>
@@ -2483,17 +2677,17 @@
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1544"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1621"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1624"/>
         <source>Firmware update failed!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1550"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1627"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -2501,7 +2695,7 @@
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="128"/>
+        <location filename="../qt-ui/globe.cpp" line="119"/>
         <source>Edit selected dive locations</source>
         <translation type="unfinished"/>
     </message>
@@ -2509,7 +2703,7 @@
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="566"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="549"/>
         <source>Location: </source>
         <translation type="unfinished"/>
     </message>
@@ -2517,7 +2711,7 @@
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="286"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="283"/>
         <source>No location set</source>
         <translation type="unfinished"/>
     </message>
@@ -2525,347 +2719,352 @@
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="133"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
+        <location filename="../qt-ui/maintab.cpp" line="497"/>
         <source>Location</source>
         <translation>Lokasi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="67"/>
         <source>Coordinates</source>
         <translation>Koordinat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="169"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="154"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Buddy</source>
         <translation>Rekan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="222"/>
+        <location filename="../qt-ui/maintab.ui" line="277"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="186"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
         <source>Rating</source>
         <translation>Peringkat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="221"/>
         <source>Visibility</source>
         <translation>Jarak Lihat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="230"/>
         <source>Suit</source>
         <translation>Pakaian</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="465"/>
+        <location filename="../qt-ui/maintab.cpp" line="470"/>
         <source>Dive notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
-        <location filename="../qt-ui/maintab.ui" line="648"/>
-        <location filename="../qt-ui/maintab.cpp" line="277"/>
+        <location filename="../qt-ui/maintab.ui" line="74"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="102"/>
+        <location filename="../qt-ui/maintab.ui" line="677"/>
+        <location filename="../qt-ui/maintab.cpp" line="279"/>
         <source>Air temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <location filename="../qt-ui/maintab.ui" line="667"/>
-        <location filename="../qt-ui/maintab.cpp" line="278"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.ui" line="696"/>
+        <location filename="../qt-ui/maintab.cpp" line="280"/>
         <source>Water temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="229"/>
-        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.ui" line="284"/>
+        <location filename="../qt-ui/maintab.cpp" line="498"/>
         <source>Notes</source>
         <translation>Catatan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="369"/>
+        <location filename="../qt-ui/maintab.ui" line="398"/>
         <source>Equipment</source>
         <translation>Perlengkapan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="496"/>
+        <location filename="../qt-ui/maintab.ui" line="525"/>
         <source>Gases used</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="515"/>
+        <location filename="../qt-ui/maintab.ui" line="544"/>
         <source>Gas consumed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="553"/>
+        <location filename="../qt-ui/maintab.ui" line="582"/>
         <source>CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="591"/>
+        <location filename="../qt-ui/maintab.ui" line="620"/>
         <source>Max. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="629"/>
+        <location filename="../qt-ui/maintab.ui" line="658"/>
         <source>Air pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="686"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>Dive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="845"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
         <source>Total time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="903"/>
+        <location filename="../qt-ui/maintab.ui" line="932"/>
         <source>Gas consumption</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="962"/>
+        <location filename="../qt-ui/maintab.ui" line="991"/>
         <source>Extra data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="968"/>
+        <location filename="../qt-ui/maintab.ui" line="997"/>
         <source>Additional data from dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="54"/>
-        <location filename="../qt-ui/maintab.ui" line="458"/>
+        <location filename="../qt-ui/maintab.ui" line="83"/>
+        <location filename="../qt-ui/maintab.ui" line="487"/>
         <source>Date</source>
         <translation>Tanggal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="61"/>
+        <location filename="../qt-ui/maintab.ui" line="90"/>
         <source>Time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="425"/>
+        <location filename="../qt-ui/maintab.ui" line="454"/>
         <source>Dive info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="477"/>
+        <location filename="../qt-ui/maintab.ui" line="506"/>
         <source>Interval</source>
         <translation>Rentang  Waktu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="534"/>
-        <location filename="../qt-ui/maintab.ui" line="799"/>
+        <location filename="../qt-ui/maintab.ui" line="563"/>
+        <location filename="../qt-ui/maintab.ui" line="828"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="610"/>
+        <location filename="../qt-ui/maintab.ui" line="639"/>
         <source>Avg. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="572"/>
+        <location filename="../qt-ui/maintab.ui" line="601"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="734"/>
         <source>Salinity</source>
         <translation>Kadar Garam</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="742"/>
+        <location filename="../qt-ui/maintab.ui" line="771"/>
         <source>Stats</source>
         <translation>Statisktik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="775"/>
+        <location filename="../qt-ui/maintab.ui" line="804"/>
         <source>Depth</source>
         <translation>Kedalaman</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="787"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Temperature</source>
         <translation>Suhu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="813"/>
+        <location filename="../qt-ui/maintab.ui" line="842"/>
         <source>Duration</source>
         <translation>Rentang Waktu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="864"/>
+        <location filename="../qt-ui/maintab.ui" line="893"/>
         <source>Dives</source>
         <translation>Selam</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="948"/>
+        <location filename="../qt-ui/maintab.ui" line="977"/>
         <source>Photos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="95"/>
+        <location filename="../qt-ui/maintab.cpp" line="87"/>
         <source>Cylinders</source>
         <translation>Tabung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="99"/>
+        <location filename="../qt-ui/maintab.cpp" line="91"/>
         <source>Weights</source>
         <translation>Berat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="55"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Apply changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="59"/>
+        <location filename="../qt-ui/maintab.cpp" line="50"/>
         <source>Discard changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="96"/>
+        <location filename="../qt-ui/maintab.cpp" line="88"/>
         <source>Add cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="100"/>
+        <location filename="../qt-ui/maintab.cpp" line="92"/>
         <source>Add weight system</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="274"/>
+        <location filename="../qt-ui/maintab.cpp" line="276"/>
         <source>Air temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="275"/>
+        <location filename="../qt-ui/maintab.cpp" line="277"/>
         <source>Water temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="312"/>
+        <location filename="../qt-ui/maintab.cpp" line="314"/>
         <source>This trip is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="320"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Multiple dives are being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.cpp" line="324"/>
         <source>This dive is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="436"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
+        <location filename="../qt-ui/maintab.cpp" line="465"/>
         <source>Trip notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="458"/>
+        <location filename="../qt-ui/maintab.cpp" line="463"/>
         <source>Trip location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="526"/>
-        <location filename="../qt-ui/maintab.cpp" line="558"/>
-        <location filename="../qt-ui/maintab.cpp" line="562"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
         <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="574"/>
         <source>/min</source>
         <translation>/menit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="555"/>
+        <location filename="../qt-ui/maintab.cpp" line="563"/>
         <source>Deepest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="556"/>
+        <location filename="../qt-ui/maintab.cpp" line="564"/>
         <source>Shallowest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="569"/>
+        <location filename="../qt-ui/maintab.cpp" line="577"/>
         <source>Highest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="578"/>
         <source>Lowest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="571"/>
+        <location filename="../qt-ui/maintab.cpp" line="579"/>
         <source>Average total SAC of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="582"/>
+        <location filename="../qt-ui/maintab.cpp" line="590"/>
         <source>Highest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="583"/>
+        <location filename="../qt-ui/maintab.cpp" line="591"/>
         <source>Lowest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="584"/>
+        <location filename="../qt-ui/maintab.cpp" line="592"/>
         <source>Average temperature of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="594"/>
+        <location filename="../qt-ui/maintab.cpp" line="602"/>
         <source>Longest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="595"/>
+        <location filename="../qt-ui/maintab.cpp" line="603"/>
         <source>Shortest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="596"/>
+        <location filename="../qt-ui/maintab.cpp" line="604"/>
         <source>Average length of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="620"/>
+        <location filename="../qt-ui/maintab.cpp" line="628"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="624"/>
+        <location filename="../qt-ui/maintab.cpp" line="632"/>
         <source> and </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="911"/>
+        <location filename="../qt-ui/maintab.cpp" line="925"/>
         <source>Discard the changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="912"/>
+        <location filename="../qt-ui/maintab.cpp" line="926"/>
         <source>You are about to discard your changes.</source>
         <translation type="unfinished"/>
     </message>
@@ -3008,7 +3207,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="296"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="232"/>
         <source>Open</source>
         <translation>Buka</translation>
     </message>
@@ -3368,90 +3567,90 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="252"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="229"/>
         <source>Open file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="256"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="233"/>
         <source>Cancel</source>
         <translation>Batal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="332"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="309"/>
         <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="444"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
         <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="491"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
         <source>Print runtime table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="834"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="811"/>
         <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="836"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="813"/>
         <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="841"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="818"/>
         <source>Save changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1196"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1173"/>
         <source>Save file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1337"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1314"/>
         <source>Open dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="819"/>
         <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="300"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="444"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="277"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1180"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1157"/>
         <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="625"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="602"/>
         <source>Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1197"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1174"/>
         <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="1338"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1315"/>
         <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"/>
     </message>
@@ -3459,7 +3658,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="651"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="634"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation type="unfinished"/>
     </message>
@@ -3467,39 +3666,39 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="239"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="243"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="244"/>
         <source>Not now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="245"/>
         <source>Update firmware</source>
         <translation>pemutakhiran peranti tegar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
         <source>Firmware upgrade notice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
         <source>Save the downloaded firmware as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
         <source>HEX files (*.hex)</source>
         <translation type="unfinished"/>
     </message>
@@ -3507,54 +3706,69 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Open circuit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>ft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="481"/>
         <source>Last stop at 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="482"/>
         <source>50% avg. depth to 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="489"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
         <source>20ft to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="485"/>
         <source>m/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
         <source>Last stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
         <source>50% avg. depth to 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="494"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
         <source>6m to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="497"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="498"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
         <source>cuft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="506"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="507"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="500"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="501"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
@@ -3673,6 +3887,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="816"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -3707,57 +3922,87 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>kgkg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="795"/>
+        <source>CCR: Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="809"/>
+        <source>Default CCR set-point for dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="832"/>
+        <source>pSCR O₂ metabolism rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="839"/>
+        <source>pSCR ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="846"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="859"/>
+        <source>1:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="875"/>
         <source>System default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="843"/>
+        <location filename="../qt-ui/preferences.ui" line="914"/>
         <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="849"/>
+        <location filename="../qt-ui/preferences.ui" line="920"/>
         <source>Proxy type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="862"/>
+        <location filename="../qt-ui/preferences.ui" line="933"/>
         <source>Host</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="888"/>
+        <location filename="../qt-ui/preferences.ui" line="959"/>
         <source>Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="914"/>
+        <location filename="../qt-ui/preferences.ui" line="985"/>
         <source>Requires authentication</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="934"/>
+        <location filename="../qt-ui/preferences.ui" line="1005"/>
         <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="957"/>
+        <location filename="../qt-ui/preferences.ui" line="1028"/>
         <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="985"/>
-        <source>about:blank</source>
+        <location filename="../qt-ui/preferences.ui" line="1079"/>
+        <source>Disconnect from Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1011"/>
-        <source>Disconnect from facebook</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="824"/>
+        <location filename="../qt-ui/preferences.ui" line="895"/>
         <source>Filter</source>
         <translation>Saring</translation>
     </message>
@@ -3912,52 +4157,52 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="28"/>
+        <location filename="../qt-ui/preferences.cpp" line="44"/>
         <source>No proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="29"/>
+        <location filename="../qt-ui/preferences.cpp" line="45"/>
         <source>System proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="30"/>
+        <location filename="../qt-ui/preferences.cpp" line="46"/>
         <source>HTTP proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="31"/>
+        <location filename="../qt-ui/preferences.cpp" line="47"/>
         <source>SOCKS proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="291"/>
+        <location filename="../qt-ui/preferences.cpp" line="324"/>
         <source>Restart required</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="292"/>
+        <location filename="../qt-ui/preferences.cpp" line="325"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="456"/>
+        <location filename="../qt-ui/preferences.cpp" line="494"/>
         <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Open default log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="455"/>
+        <location filename="../qt-ui/preferences.cpp" line="493"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
@@ -3965,17 +4210,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="91"/>
+        <location filename="../qt-ui/printdialog.cpp" line="85"/>
         <source>&amp;Preview</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="88"/>
+        <location filename="../qt-ui/printdialog.cpp" line="82"/>
         <source>P&amp;rint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="103"/>
+        <location filename="../qt-ui/printdialog.cpp" line="97"/>
         <source>Print</source>
         <translation type="unfinished"/>
     </message>
@@ -3983,42 +4228,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="20"/>
         <source>Dive#</source>
         <translation>Selam#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="21"/>
         <source>Date</source>
         <translation>Tanggal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="22"/>
         <source>Depth</source>
         <translation>Kedalaman</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="23"/>
         <source>Duration</source>
         <translation>Durasi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Master</source>
         <translation>Master</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Buddy</source>
         <translation>Rekan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="34"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Location</source>
         <translation>Lokasi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <location filename="../qt-ui/printlayout.cpp" line="63"/>
         <source>Subsurface cannot find a usable printer on this system!</source>
         <translation type="unfinished"/>
     </message>
@@ -4084,72 +4329,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2095"/>
+        <location filename="../qt-ui/models.cpp" line="2101"/>
         <source>unknown</source>
         <translation>Tak dikenal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2100"/>
+        <location filename="../qt-ui/models.cpp" line="2106"/>
         <source>Dive #%1 - %2</source>
         <translation>Selam #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2103"/>
+        <location filename="../qt-ui/models.cpp" line="2109"/>
         <source>Max depth: %1 %2</source>
         <translation>Kedalaman Maks: 1% 2%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2110"/>
+        <location filename="../qt-ui/models.cpp" line="2116"/>
         <source>Duration: %1 min</source>
         <translation>Durasi: %1 menit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2115"/>
+        <location filename="../qt-ui/models.cpp" line="2121"/>
         <source>Gas used:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2117"/>
+        <location filename="../qt-ui/models.cpp" line="2123"/>
         <source>Tags:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2119"/>
+        <location filename="../qt-ui/models.cpp" line="2125"/>
         <source>SAC:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2121"/>
+        <location filename="../qt-ui/models.cpp" line="2127"/>
         <source>Weights:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2126"/>
+        <location filename="../qt-ui/models.cpp" line="2132"/>
         <source>Notes:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2133"/>
+        <location filename="../qt-ui/models.cpp" line="2139"/>
         <source>Divemaster:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2135"/>
+        <location filename="../qt-ui/models.cpp" line="2141"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2137"/>
+        <location filename="../qt-ui/models.cpp" line="2143"/>
         <source>Suit:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2139"/>
+        <location filename="../qt-ui/models.cpp" line="2145"/>
         <source>Viz:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2141"/>
+        <location filename="../qt-ui/models.cpp" line="2147"/>
         <source>Rating:</source>
         <translation type="unfinished"/>
     </message>
@@ -4157,103 +4402,108 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="628"/>
         <source> (#%1 of %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="630"/>
+        <source>Unknown dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="647"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1168"/>
         <source>Make first divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Delete this divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1184"/>
         <source>Add gas change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1187"/>
         <source> (Tank %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1195"/>
         <source>Add set-point change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1197"/>
         <source>Add bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
         <source>Remove event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1206"/>
         <source>Hide similar events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1213"/>
         <source>Edit name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1242"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1249"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1264"/>
         <source>Unhide all events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide all %1 events?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1333"/>
         <source>Remove the selected event?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1334"/>
         <source>%1 @ %2:%3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1424"/>
         <source>Edit name of bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
         <source>Custom name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1430"/>
         <source>Name is too long!</source>
         <translation type="unfinished"/>
     </message>
@@ -4261,102 +4511,102 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>AIR</source>
         <translation>UDARA</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>OXYGEN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="208"/>
         <source>Remove this point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="57"/>
         <source>Close</source>
         <translation>Tutup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="42"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="25"/>
         <source>Average</source>
         <translation>Rata-rata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="45"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="28"/>
         <source>Minimum</source>
         <translation>Minimal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="48"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="31"/>
         <source>Maximum</source>
         <translation>Maksimal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="297"/>
+        <location filename="../qt-ui/globe.cpp" line="296"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="525"/>
         <source>kg</source>
         <translation>kgkg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="526"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="550"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="551"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="570"/>
+        <location filename="../qt-ui/models.cpp" line="574"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="571"/>
+        <location filename="../qt-ui/models.cpp" line="575"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="595"/>
+        <location filename="../qt-ui/models.cpp" line="599"/>
         <source>l</source>
         <translation>I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="596"/>
+        <location filename="../qt-ui/models.cpp" line="600"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="513"/>
         <source>Invalid response from server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="567"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation type="unfinished"/>
     </message>
@@ -4364,12 +4614,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1450"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1518"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1442"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -4383,12 +4633,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
-        <location filename="../qt-ui/simplewidgets.cpp" line="151"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="134"/>
         <source>New starting number</source>
         <translation>Nomor Awal baru</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="149"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="132"/>
         <source>New number</source>
         <translation type="unfinished"/>
     </message>
@@ -4396,12 +4646,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1575"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1653"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1579"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1657"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -4480,12 +4730,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="276"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="259"/>
         <source>Open image file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="278"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="261"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation type="unfinished"/>
     </message>
@@ -4538,7 +4788,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <name>SocialNetworkDialog</name>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="282"/>
-        <source>Dive Date: %1 
+        <source>Dive date: %1 
 </source>
         <translation type="unfinished"/>
     </message>
@@ -4562,7 +4812,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="290"/>
-        <source>Dive Location: %1 
+        <source>Dive location: %1 
 </source>
         <translation type="unfinished"/>
     </message>
@@ -4679,47 +4929,47 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="329"/>
         <source>Webservice</source>
         <translation>Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="393"/>
         <source>Connecting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
         <source>Download finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Download error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="436"/>
         <source>Connection error: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
         <source>Download successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="439"/>
         <source>Invalid user identifier!</source>
         <translation>identifikasi pengguna tidak cocok!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="312"/>
         <source>Enter User ID and click Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="442"/>
         <source>Cannot parse response!</source>
         <translation>Respon gagal di telaah!</translation>
     </message>
@@ -4727,7 +4977,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="592"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="575"/>
         <source>Suits: </source>
         <translation type="unfinished"/>
     </message>
@@ -4735,7 +4985,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="119"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="116"/>
         <source>No suit set</source>
         <translation type="unfinished"/>
     </message>
@@ -4752,7 +5002,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="513"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="496"/>
         <source>Tags: </source>
         <translation type="unfinished"/>
     </message>
@@ -4760,7 +5010,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="144"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="141"/>
         <source>Empty tags</source>
         <translation type="unfinished"/>
     </message>
@@ -4768,17 +5018,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>Description</source>
         <translation>Penjelasan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -4786,7 +5036,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="141"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="131"/>
         <source>Information</source>
         <translation>Informasi</translation>
     </message>
@@ -4794,7 +5044,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1090"/>
+        <location filename="../qt-ui/models.cpp" line="1094"/>
         <source> (%1 shown)</source>
         <translation type="unfinished"/>
     </message>
@@ -4802,72 +5052,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="64"/>
         <source>Check for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="66"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="70"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="72"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
         <source>Please check your internet connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="85"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="84"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="88"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="95"/>
         <source>A new version of Subsurface is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="97"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
         <source>Latest version is %1, please check with your OS vendor for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="103"/>
         <source>Newest release version is </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="105"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
         <source>The server returned the following information:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="121"/>
         <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
         <source>Decline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="124"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
         <source>Accept</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="126"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="125"/>
         <source>Automatic check for updates</source>
         <translation type="unfinished"/>
     </message>
@@ -4875,13 +5125,13 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UserManual</name>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="55"/>
+        <location filename="../qt-ui/usermanual.cpp" line="54"/>
         <source>User Manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="72"/>
-        <location filename="../qt-ui/usermanual.cpp" line="78"/>
+        <location filename="../qt-ui/usermanual.cpp" line="71"/>
+        <location filename="../qt-ui/usermanual.cpp" line="77"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Panduan Subsurface tak dapat ditemukan</translation>
     </message>
@@ -4959,81 +5209,81 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
         <source>
 Operating System: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
         <source>
 CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 Language: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="93"/>
         <source>Should we ask you later?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Don&apos;t ask me again</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Ask later</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
         <source>Submit user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask again?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="17"/>
         <source>Send</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="121"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>Please check your internet connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="131"/>
         <source>Survey successfully submitted.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="136"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation type="unfinished"/>
     </message>
@@ -5041,12 +5291,12 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>Description</source>
         <translation>Penjelasan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>kg</source>
         <translation>kgkg</translation>
     </message>
@@ -5094,12 +5344,12 @@ OS CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="247"/>
         <source>Operation timed out</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="268"/>
         <source>Transferring data...</source>
         <translation type="unfinished"/>
     </message>
@@ -5107,17 +5357,17 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Type</source>
         <translation>Tipe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Weight</source>
         <translation>Berat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="496"/>
+        <location filename="../qt-ui/models.cpp" line="500"/>
         <source>Clicking here will remove this weight system.</source>
         <translation type="unfinished"/>
     </message>
@@ -5125,19 +5375,19 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1479"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1487"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1497"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1555"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1566"/>
         <source>Failed!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1506"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1576"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1580"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -5145,77 +5395,77 @@ OS CPU Architecture: %1</source>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1841"/>
+        <location filename="../qt-ui/models.cpp" line="1847"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1844"/>
+        <location filename="../qt-ui/models.cpp" line="1850"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1847"/>
+        <location filename="../qt-ui/models.cpp" line="1853"/>
         <source>Duration 
  Total</source>
         <translation>Total Durasi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1850"/>
+        <location filename="../qt-ui/models.cpp" line="1856"/>
         <source>
 Average</source>
         <translation>
 Rata-rata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1853"/>
+        <location filename="../qt-ui/models.cpp" line="1859"/>
         <source>
 Shortest</source>
         <translation>
 Terpendek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1856"/>
+        <location filename="../qt-ui/models.cpp" line="1862"/>
         <source>
 Longest</source>
         <translation>
 Terjauh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1859"/>
+        <location filename="../qt-ui/models.cpp" line="1865"/>
         <source>Depth (%1)
  Average</source>
         <translation>Dalam (%1)
 Rata-rata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1862"/>
-        <location filename="../qt-ui/models.cpp" line="1871"/>
-        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>
 Minimum</source>
         <translation>
 Minimal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1865"/>
-        <location filename="../qt-ui/models.cpp" line="1874"/>
-        <location filename="../qt-ui/models.cpp" line="1883"/>
+        <location filename="../qt-ui/models.cpp" line="1871"/>
+        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>
 Maximum</source>
         <translation>
 Maksimal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1874"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Rata-rata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1883"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -5296,40 +5546,40 @@ Rata-rata</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1508"/>
+        <location filename="../dive.c" line="1530"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) or (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="464"/>
+        <location filename="../divelist.c" line="467"/>
         <location filename="../equipment.c" line="81"/>
-        <location filename="../planner.c" line="1060"/>
-        <location filename="../planner.c" line="1063"/>
+        <location filename="../planner.c" line="1081"/>
+        <location filename="../planner.c" line="1084"/>
         <source>air</source>
         <translation>udara</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="192"/>
+        <location filename="../equipment.c" line="194"/>
         <source>integrated</source>
         <translation>terintegrasi</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="193"/>
+        <location filename="../equipment.c" line="195"/>
         <source>belt</source>
         <translation>sabuk</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="194"/>
+        <location filename="../equipment.c" line="196"/>
         <source>ankle</source>
         <translation>Pergelangan kaki</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="195"/>
+        <location filename="../equipment.c" line="197"/>
         <source>backplate weight</source>
         <translation>berat plat-punggung</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="196"/>
+        <location filename="../equipment.c" line="198"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -5337,7 +5587,7 @@ Rata-rata</translation>
         <location filename="../file.c" line="112"/>
         <location filename="../file.c" line="434"/>
         <location filename="../file.c" line="506"/>
-        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="925"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Gagal baca &apos;%s&apos;</translation>
     </message>
@@ -5394,9 +5644,9 @@ Rata-rata</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../file.c" line="869"/>
-        <location filename="../file.c" line="909"/>
-        <location filename="../file.c" line="1007"/>
+        <location filename="../file.c" line="870"/>
+        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="1016"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation type="unfinished"/>
     </message>
@@ -5567,27 +5817,27 @@ Rata-rata</translation>
         <translation>nomor kejadian tidak sesuai</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="421"/>
+        <location filename="../libdivecomputer.c" line="419"/>
         <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="427"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Error registering the data</source>
         <translation>Gagal mendaftarkan data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="433"/>
         <source>Error parsing the datetime</source>
         <translation>Gagal mengurai tanggal</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Dive %d: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="455"/>
+        <location filename="../libdivecomputer.c" line="454"/>
         <source>Error parsing the divetime</source>
         <translation>Gagal mengurai waktu selam</translation>
     </message>
@@ -5597,155 +5847,155 @@ Rata-rata</translation>
         <translation>Gagal mengurai kedalamn maks</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="482"/>
+        <location filename="../libdivecomputer.c" line="483"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="501"/>
+        <location filename="../libdivecomputer.c" line="503"/>
         <source>Error parsing the gas mix count</source>
         <translation>Gagal mengurai perhitungan campuran gas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="513"/>
+        <location filename="../libdivecomputer.c" line="515"/>
         <source>Error obtaining water salinity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="521"/>
+        <location filename="../libdivecomputer.c" line="524"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="545"/>
+        <location filename="../libdivecomputer.c" line="549"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="562"/>
+        <location filename="../libdivecomputer.c" line="569"/>
         <source>Error parsing the gas mix</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="569"/>
+        <location filename="../libdivecomputer.c" line="576"/>
         <source>Error parsing the samples</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="706"/>
+        <location filename="../libdivecomputer.c" line="713"/>
         <source>Event: waiting for user action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="714"/>
+        <location filename="../libdivecomputer.c" line="721"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="778"/>
+        <location filename="../libdivecomputer.c" line="785"/>
         <source>Error registering the event handler.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="783"/>
+        <location filename="../libdivecomputer.c" line="790"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="804"/>
+        <location filename="../libdivecomputer.c" line="811"/>
         <source>Dive data import error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="843"/>
+        <location filename="../libdivecomputer.c" line="850"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="850"/>
+        <location filename="../libdivecomputer.c" line="857"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="858"/>
+        <location filename="../libdivecomputer.c" line="865"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="506"/>
+        <location filename="../parse-xml.c" line="516"/>
         <source>Strange percentage reading %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1760"/>
+        <location filename="../parse-xml.c" line="1770"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1989"/>
-        <location filename="../parse-xml.c" line="2137"/>
+        <location filename="../parse-xml.c" line="1999"/>
+        <location filename="../parse-xml.c" line="2147"/>
         <source>Database query dm4_events failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1996"/>
-        <location filename="../parse-xml.c" line="2144"/>
+        <location filename="../parse-xml.c" line="2006"/>
+        <location filename="../parse-xml.c" line="2154"/>
         <source>Database query dm4_tags failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2318"/>
+        <location filename="../parse-xml.c" line="2328"/>
         <source>Database query shearwater_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2325"/>
+        <location filename="../parse-xml.c" line="2335"/>
         <source>Database query shearwater_changes failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2332"/>
+        <location filename="../parse-xml.c" line="2342"/>
         <source>Database query shearwater_profile_sample failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2451"/>
+        <location filename="../parse-xml.c" line="2461"/>
         <source>Database query cobalt_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2458"/>
+        <location filename="../parse-xml.c" line="2468"/>
         <source>Database query cobalt_buddies failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2465"/>
+        <location filename="../parse-xml.c" line="2475"/>
         <source>Database query cobalt_visibility failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2472"/>
+        <location filename="../parse-xml.c" line="2482"/>
         <source>Database query cobalt_location failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2479"/>
+        <location filename="../parse-xml.c" line="2489"/>
         <source>Database query cobalt_location (site) failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2486"/>
+        <location filename="../parse-xml.c" line="2496"/>
         <source>Database query cobalt_profile_sample failed.
 </source>
         <translation type="unfinished"/>
@@ -5757,16 +6007,16 @@ Rata-rata</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2168"/>
-        <location filename="../parse-xml.c" line="2189"/>
-        <location filename="../parse-xml.c" line="2508"/>
-        <location filename="../parse-xml.c" line="2527"/>
+        <location filename="../parse-xml.c" line="2178"/>
+        <location filename="../parse-xml.c" line="2199"/>
+        <location filename="../parse-xml.c" line="2518"/>
+        <location filename="../parse-xml.c" line="2537"/>
         <source>Database query failed '%s'.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2848"/>
+        <location filename="../parse-xml.c" line="2909"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation type="unfinished"/>
     </message>
@@ -5776,361 +6026,367 @@ Rata-rata</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="820"/>
+        <location filename="../planner.c" line="841"/>
         <source>Can&apos;t find gas %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="356"/>
+        <location filename="../planner.c" line="363"/>
         <source>Too many gas mixes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="540"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="548"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="544"/>
+        <location filename="../planner.c" line="551"/>
         <source>Subsurface dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="548"/>
+        <location filename="../planner.c" line="555"/>
         <source>depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="558"/>
         <source>runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="554"/>
+        <location filename="../planner.c" line="561"/>
         <source>duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="557"/>
+        <location filename="../planner.c" line="564"/>
         <source>gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="594"/>
+        <location filename="../planner.c" line="601"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="602"/>
+        <location filename="../planner.c" line="609"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="615"/>
+        <location filename="../planner.c" line="622"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="622"/>
+        <location filename="../planner.c" line="629"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="635"/>
+        <location filename="../planner.c" line="642"/>
         <source>%3.0f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="638"/>
-        <location filename="../planner.c" line="642"/>
+        <location filename="../planner.c" line="645"/>
+        <location filename="../planner.c" line="649"/>
         <source>%3dmin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="651"/>
+        <location filename="../planner.c" line="658"/>
         <source>(SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="676"/>
+        <location filename="../planner.c" line="683"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="678"/>
+        <location filename="../planner.c" line="685"/>
         <source>Switch gas to %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="697"/>
+        <location filename="../planner.c" line="704"/>
         <source>CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="699"/>
+        <location filename="../planner.c" line="706"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="710"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="705"/>
+        <location filename="../planner.c" line="712"/>
         <source>Gas consumption:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="535"/>
-        <location filename="../planner.c" line="725"/>
-        <location filename="../planner.c" line="730"/>
-        <location filename="../planner.c" line="753"/>
+        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="732"/>
+        <location filename="../planner.c" line="737"/>
+        <location filename="../planner.c" line="762"/>
+        <location filename="../planner.c" line="772"/>
         <source>Warning:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="523"/>
+        <location filename="../planner.c" line="530"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="726"/>
+        <location filename="../planner.c" line="733"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="731"/>
+        <location filename="../planner.c" line="738"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="733"/>
+        <location filename="../planner.c" line="740"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="735"/>
+        <location filename="../planner.c" line="742"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="759"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="1064"/>
+        <location filename="../planner.c" line="769"/>
+        <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="1085"/>
         <source>ean</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1099"/>
+        <location filename="../profile.c" line="1113"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1102"/>
+        <location filename="../profile.c" line="1116"/>
         <source>P: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1106"/>
+        <location filename="../profile.c" line="1120"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1112"/>
+        <location filename="../profile.c" line="1126"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1115"/>
+        <location filename="../profile.c" line="1129"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1117"/>
+        <location filename="../profile.c" line="1131"/>
         <source>CNS: %u%%
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1119"/>
+        <location filename="../profile.c" line="1133"/>
         <source>pO%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1121"/>
+        <location filename="../profile.c" line="1135"/>
         <source>pN%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1123"/>
+        <location filename="../profile.c" line="1137"/>
         <source>pHe: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1140"/>
         <source>MOD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1147"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1137"/>
+        <location filename="../profile.c" line="1151"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1149"/>
+        <location filename="../profile.c" line="1163"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1152"/>
+        <location filename="../profile.c" line="1166"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1157"/>
+        <location filename="../profile.c" line="1171"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1174"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1178"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1166"/>
+        <location filename="../profile.c" line="1180"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1183"/>
         <source>TTS: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1172"/>
+        <location filename="../profile.c" line="1186"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1180"/>
+        <location filename="../profile.c" line="1194"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1196"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1185"/>
+        <location filename="../profile.c" line="1199"/>
         <source>TTS: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1188"/>
+        <location filename="../profile.c" line="1202"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1194"/>
+        <location filename="../profile.c" line="1208"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1214"/>
         <source>heartbeat: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1202"/>
+        <location filename="../profile.c" line="1216"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1205"/>
+        <location filename="../profile.c" line="1219"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1314"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1304"/>
-        <location filename="../profile.c" line="1308"/>
-        <location filename="../profile.c" line="1312"/>
+        <location filename="../profile.c" line="1318"/>
+        <location filename="../profile.c" line="1322"/>
+        <location filename="../profile.c" line="1326"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1316"/>
+        <location filename="../profile.c" line="1330"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1334"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1324"/>
-        <location filename="../profile.c" line="1328"/>
+        <location filename="../profile.c" line="1338"/>
+        <location filename="../profile.c" line="1342"/>
         <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1335"/>
+        <location filename="../profile.c" line="1349"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
@@ -6261,6 +6517,7 @@ EADD: %d%s
     </message>
     <message>
         <location filename="../dive.c" line="30"/>
+        <location filename="../equipment.c" line="85"/>
         <source>oxygen</source>
         <translation type="unfinished"/>
     </message>
@@ -6315,97 +6572,97 @@ EADD: %d%s
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sun</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Mon</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Tue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Wed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Thu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Fri</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Feb</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Mar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Apr</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>May</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jun</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Jul</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Aug</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Sep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Oct</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Nov</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Dec</source>
         <translation type="unfinished"/>
     </message>
@@ -7004,13 +7261,13 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
         <source>GF low</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>%</source>
         <translation type="unfinished"/>
     </message>
@@ -7020,7 +7277,7 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="335"/>
         <source>Drop to first depth</source>
         <translation type="unfinished"/>
     </message>
@@ -7030,69 +7287,69 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
         <source>Plan backgas breaks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="355"/>
         <source>Gas options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="376"/>
         <source>Bottom SAC</source>
         <translation>SAC  bawah</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="383"/>
         <source>Deco SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="380"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="390"/>
         <source>Bottom pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="403"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="413"/>
         <source>Deco pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="449"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="462"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="478"/>
         <source>Dive notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
         <source>Display runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <source>Display segment duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="531"/>
         <source>Display transitions in deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="538"/>
         <source>Verbatim dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="387"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="410"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="397"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -7112,17 +7369,17 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="499"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="515"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/subsurface_it_IT.ts b/translations/subsurface_it_IT.ts
index 0876b4b8a..9f7210f6a 100644
--- a/translations/subsurface_it_IT.ts
+++ b/translations/subsurface_it_IT.ts
@@ -3,12 +3,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="539"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="522"/>
         <source>Person: </source>
         <translation>Persona:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="540"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="523"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Ricerca compagni di immersione e Divemaster</translation>
     </message>
@@ -16,40 +16,188 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="233"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="230"/>
         <source>No buddies</source>
         <translation>Nessun compagno di immersione</translation>
     </message>
 </context>
 <context>
+    <name>ColumnNameProvider</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>GPS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Avg depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="210"/>
+        <location filename="../configuredivecomputer.cpp" line="212"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation>Non è stato possibile salvare il file di backup %1. Messaggio di errore: %2</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="226"/>
+        <location filename="../configuredivecomputer.cpp" line="228"/>
         <source>Could not open backup file: %1</source>
         <translation>Non è possibile aprire il file di backup: %1</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="542"/>
+        <location filename="../configuredivecomputer.cpp" line="552"/>
         <source>Dive computer details read successfully</source>
         <translation>Dettagli del computer letti correttamente</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="551"/>
+        <location filename="../configuredivecomputer.cpp" line="561"/>
         <source>Setting successfully written to device</source>
         <translation>Impostazioni salvate correttamente sullo strumento </translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="560"/>
+        <location filename="../configuredivecomputer.cpp" line="570"/>
         <source>Device firmware successfully updated</source>
         <translation>Firmware del dispositivo caricato correttamente</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="569"/>
+        <location filename="../configuredivecomputer.cpp" line="579"/>
         <source>Device settings successfully reset</source>
         <translation>Impostazioni del dispositivo ripristinate correttamente</translation>
     </message>
@@ -847,72 +995,72 @@
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1053"/>
         <source>Backup files (*.xml)</source>
         <translation>Backup files (*.xml)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1037"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>Si è verificato un errore nel salvataggio del file di backup.
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1040"/>
         <source>Backup succeeded</source>
         <translation>Backup eseguito con successo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1041"/>
         <source>Your settings have been saved to: %1</source>
         <translation>Le tue impostazioni sono state salvate in: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1030"/>
         <source>Backup dive computer settings</source>
         <translation>Backup delle impostazioni del computer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1036"/>
         <source>XML backup error</source>
         <translation>Errore backup XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1052"/>
         <source>Restore dive computer settings</source>
         <translation>Ripristina le impostazioni del computer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1056"/>
         <source>XML restore error</source>
         <translation>Errore ripristino XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1057"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>Si è verificato un errore nel ripristino del file di backup.
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1063"/>
         <source>Restore succeeded</source>
         <translation>Ripristino avvenuto con successo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1064"/>
         <source>Your settings have been restored successfully.</source>
         <translation>Le tue impostazioni sono state ripristinate correttamente.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1074"/>
         <source>Select firmware file</source>
         <translation>Seleziona il file del firmware</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1075"/>
         <source>All files (*.*)</source>
         <translation>Tutti i file (*.*)</translation>
     </message>
@@ -970,12 +1118,12 @@
         <translation>Cliccando qui si rimuove la bombola.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="410"/>
         <source>Cylinder cannot be removed</source>
         <translation>La bombola non può essere rimossa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="407"/>
+        <location filename="../qt-ui/models.cpp" line="411"/>
         <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>
@@ -1051,12 +1199,12 @@
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="48"/>
         <source>Remove the selected dive computer?</source>
         <translation>Rimuovere il computer selezionato?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="49"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
         <translation>Sei sicuro di volere cancellare
@@ -1071,22 +1219,22 @@ il computer selezionato?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Model</source>
         <translation>Modello</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Device ID</source>
         <translation>ID della periferica</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Nickname</source>
         <translation>Nickname</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Cliccando qui si rimuoverà il computer.</translation>
     </message>
@@ -1094,117 +1242,145 @@ il computer selezionato?</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="115"/>
         <source>Bailing out to OC</source>
         <translation>Bailing out in circuito aperto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="117"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>inizio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>fine</translation>
     </message>
 </context>
 <context>
+    <name>DiveImportedModel</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="556"/>
+        <source>Date/time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
+        <source>Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>h:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>min</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1242"/>
+        <location filename="../qt-ui/models.cpp" line="1248"/>
         <source>#</source>
         <translation>n</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1245"/>
+        <location filename="../qt-ui/models.cpp" line="1251"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1248"/>
+        <location filename="../qt-ui/models.cpp" line="1254"/>
         <source>Rating</source>
         <translation>Valutazione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Depth(%1)</source>
         <translation>Prof. (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1254"/>
+        <location filename="../qt-ui/models.cpp" line="1260"/>
         <source>Duration</source>
         <translation>Durata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1263"/>
         <source>Temp(%1%2)</source>
         <translation>Temp (%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>Weight(%1)</source>
         <translation>Peso(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1263"/>
+        <location filename="../qt-ui/models.cpp" line="1269"/>
         <source>Suit</source>
         <translation>Muta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1266"/>
+        <location filename="../qt-ui/models.cpp" line="1272"/>
         <source>Cyl</source>
         <translation>Bombola</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1269"/>
+        <location filename="../qt-ui/models.cpp" line="1275"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>SAC(%1)</source>
         <translation>CAS(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1277"/>
+        <location filename="../qt-ui/models.cpp" line="1283"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1280"/>
+        <location filename="../qt-ui/models.cpp" line="1286"/>
         <source>Max CNS</source>
         <translation>CNS massimo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1283"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>Location</source>
         <translation>Luogo</translation>
     </message>
@@ -1212,87 +1388,87 @@ il computer selezionato?</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="787"/>
+        <location filename="../qt-ui/divelistview.cpp" line="768"/>
         <source>Expand all</source>
         <translation>Espandi tutto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="788"/>
+        <location filename="../qt-ui/divelistview.cpp" line="769"/>
         <source>Collapse all</source>
         <translation>Minimizza tutto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="789"/>
+        <location filename="../qt-ui/divelistview.cpp" line="770"/>
         <source>Collapse others</source>
         <translation>Collassa altri</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="791"/>
+        <location filename="../qt-ui/divelistview.cpp" line="772"/>
         <source>Remove dive(s) from trip</source>
         <translation>Rimuove immersione(i) dal viaggio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="792"/>
+        <location filename="../qt-ui/divelistview.cpp" line="773"/>
         <source>Create new trip above</source>
         <translation>Crea un nuovo viaggio sopra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="806"/>
+        <location filename="../qt-ui/divelistview.cpp" line="787"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Aggiungi l&apos;immersione(i) al viaggio subito sopra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="808"/>
+        <location filename="../qt-ui/divelistview.cpp" line="789"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Aggiungi l&apos;immersione(i) al viaggio subito sotto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="812"/>
+        <location filename="../qt-ui/divelistview.cpp" line="793"/>
         <source>Merge trip with trip above</source>
         <translation>Raggruppa il viaggio con il viaggio sopra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="813"/>
+        <location filename="../qt-ui/divelistview.cpp" line="794"/>
         <source>Merge trip with trip below</source>
         <translation>Raggruppa il viaggio con il viaggio sotto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="817"/>
+        <location filename="../qt-ui/divelistview.cpp" line="798"/>
         <source>Delete dive(s)</source>
         <translation>Cancella immersione(i)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="819"/>
+        <location filename="../qt-ui/divelistview.cpp" line="800"/>
         <source>Mark dive(s) invalid</source>
         <translation>Marca l&apos;immersione(i) come non valide</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="823"/>
+        <location filename="../qt-ui/divelistview.cpp" line="804"/>
         <source>Merge selected dives</source>
         <translation>Fondi le immersioni selezionate</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="825"/>
+        <location filename="../qt-ui/divelistview.cpp" line="806"/>
         <source>Renumber dive(s)</source>
         <translation>Rinumera le immersioni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="826"/>
+        <location filename="../qt-ui/divelistview.cpp" line="807"/>
         <source>Shift times</source>
         <translation>Cambia gli orari</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="827"/>
+        <location filename="../qt-ui/divelistview.cpp" line="808"/>
         <source>Load images</source>
         <translation>Carica immagini</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Open image files</source>
         <translation>Apri files di immagine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Files immagine (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -1477,100 +1653,100 @@ il computer selezionato?</translation>
         <translation>Sabbia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>File UDDF (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="268"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>CSV files (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="68"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Formato generico usato per lo scambio di informazioni tra diverse applicazioni in campo subacqueo.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>Valori separati da virgola che descrivono il profilo di immersione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation>Valori separati da virgole che includono la maggior parte delle informazioni di immersione ma non include il profilo di immersione.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Invia i dati di immersione al sito divelogs.de.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>Invia i dati di immersione al sito dive-share.appspot.com</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>Esportazione HTML dei luoghi di immersione, visualizzati su un mappamondo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
         <source>Subsurface native XML format.</source>
         <translation>Formato XML nativo di Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
         <source>Write depths of images to file.</source>
         <translation>Esporta la profondità a cui sono state scattate le foto.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export UDDF file as</source>
         <translation>Esporta file UDDF come</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="267"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
         <source>Export CSV file as</source>
         <translation>Esporta file CSV come</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="278"/>
         <source>Export world map</source>
         <translation>Esporta il mappamondo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="299"/>
         <source>HTML files (*.html)</source>
         <translation>File HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="283"/>
         <source>Export Subsurface XML</source>
         <translation>Esporta Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="284"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML files (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
         <source>Save image depths</source>
         <translation>Salva la profondità a cui sono state scattate le foto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="298"/>
         <source>Export HTML files as</source>
         <translation>Esporta file HTML come</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
         <source>Can&apos;t open file %s</source>
         <translation>Non posso aprire il file %s</translation>
     </message>
@@ -1583,248 +1759,228 @@ il computer selezionato?</translation>
         <translation>Importa log delle immersioni da file</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
-        <source>CSV options</source>
-        <translation>Opzioni formato CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="281"/>
-        <source>Pre-configured imports</source>
-        <translation>Importazioni preconfigurate</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="122"/>
-        <source>Depth</source>
-        <translation>Profondità</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="142"/>
-        <source>Stopdepth</source>
-        <translation>Profondità della sosta</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="162"/>
-        <source>Pressure</source>
-        <translation>Pressione</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="176"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="466"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
         <source>Time</source>
         <translation>Ora</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="183"/>
-        <source>Temp</source>
-        <translation>Temperatura</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="213"/>
-        <source>NDL</source>
-        <translation>NDL</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="233"/>
-        <source>TTS</source>
-        <translation>TTS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="253"/>
-        <source>Cns</source>
-        <translation>CNS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="58"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="789"/>
-        <source>Field separator</source>
-        <translation>Separatore di campo</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="35"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="363"/>
-        <source>Units</source>
-        <translation>Unità</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="42"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="370"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="97"/>
         <source>Metric</source>
         <translation>Metrico</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="47"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="375"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="102"/>
         <source>Imperial</source>
         <translation>Imperiale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="169"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="298"/>
-        <source>Manual dives</source>
-        <translation>Immersioni manuali</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="316"/>
-        <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source>
-        <translation>Scegli l&apos;ordine del giorno, mese e anno per il formato della data. Puoi usare qualsiasi carattere come separatore .-/.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="319"/>
-        <source>Date format</source>
-        <translation>Formato della data</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="332"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="59"/>
         <source>dd.mm.yyyy</source>
         <translation>dd.mm.yyyy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="337"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="64"/>
         <source>mm/dd/yyyy</source>
         <translation>mm/dd/yyyy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="342"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="69"/>
         <source>yyyy-mm-dd</source>
         <translation>yyyy-mm-dd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="392"/>
-        <source>Dive #</source>
-        <translation>Immersione nº</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="426"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="439"/>
-        <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source>
-        <translation>Data in formato dd.mm.yyyy, yyyy-mm-dd o mm/dd/yyyy</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+        <source>Dive #</source>
+        <translation>Immersione nº</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="429"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="500"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="513"/>
-        <source>Dive duration in seconds or in min:sec format</source>
-        <translation>Durata dell&apos;immersione in secondi nel formato min:sec</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="503"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
         <source>Duration</source>
         <translation>Durata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="574"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="591"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
         <source>Tags</source>
         <translation>Tags</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="608"/>
-        <source>Cyl size</source>
-        <translation>Dimensione bombola</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="625"/>
-        <source>Air temp</source>
-        <translation>Temperatura aria</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="642"/>
-        <source>Start Pressure</source>
-        <translation>Pressione iniziale</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="659"/>
-        <source>Water temp</source>
-        <translation>Temperatura dell&apos;acqua</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="676"/>
-        <source>End Press</source>
-        <translation>Press. finale</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="693"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
         <source>O₂</source>
         <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="710"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
         <source>He</source>
         <translation>He</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="742"/>
-        <source>Choose duration format.</source>
-        <translation>Scegli il formato del tempo</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="745"/>
-        <source>Duration format</source>
-        <translation>Formato della durata</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="758"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="78"/>
         <source>Seconds</source>
         <translation>Secondi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="763"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
         <source>Minutes</source>
         <translation>Minuti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="768"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="88"/>
         <source>Minutes:seconds</source>
         <translation>Minuti:secondi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="540"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
         <source>Location</source>
         <translation>Luogo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="409"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
         <source>Max depth</source>
         <translation>Profondità massima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="386"/>
-        <source>Field configuration</source>
-        <translation>Configurazione dei campi</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+        <source>Tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+        <source>Samples pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
         <source>Mean depth</source>
         <translation>Profondità media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="483"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
         <source>Buddy</source>
         <translation>Compagno</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="523"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
         <source>Notes</source>
         <translation>Note</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="557"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DivePlanner</name>
@@ -1867,42 +2023,42 @@ il computer selezionato?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
         <source>unknown</source>
         <translation>sconosciuto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="691"/>
         <source>Final depth</source>
         <translation>Profondità finale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="693"/>
         <source>Run time</source>
         <translation>Run Time</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="701"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="695"/>
         <source>Duration</source>
         <translation>Durata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="703"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
         <source>Used gas</source>
         <translation>Gas utilizzato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="705"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
         <source>CC set point</source>
         <translation>CC set point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1044"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1051"/>
         <source>Discard the plan?</source>
         <translation>Eliminare il piano?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1045"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1052"/>
         <source>You are about to discard your plan.</source>
         <translation>Stai cancellando il piano</translation>
     </message>
@@ -1910,22 +2066,22 @@ il computer selezionato?</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="257"/>
         <source>Dive planner points</source>
         <translation>Punti del pianificatore di immersione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="261"/>
         <source>Available gases</source>
         <translation>Miscele disponibili</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="284"/>
         <source>Add dive data point</source>
         <translation>Aggiungi punto del profilo di immersione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="304"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="293"/>
         <source>Save new</source>
         <translation>Salva nuovo</translation>
     </message>
@@ -1933,92 +2089,112 @@ il computer selezionato?</translation>
 <context>
     <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Depth</source>
         <translation>Profondità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
         <source>Time</source>
         <translation>Ora</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
         <source>Pressure</source>
         <translation>Pressione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
         <source>Color</source>
         <translation>Colore</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
         <source>Pressure S</source>
         <translation>Pressione S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
+        <source>Setpoint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
+        <source>Sensor1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
+        <source>Sensor2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
+        <source>Sensor3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
         <source>Ambient pressure</source>
         <translation>Pressione ambiente</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
-        <source>Heart Beat</source>
-        <translation>Battito cardiaco</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
+        <source>Heart beat</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
-        <source>Gradient Factor</source>
-        <translation>Gradient Factor</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/>
+        <source>Gradient factor</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
-        <source>Mean Depth/s</source>
-        <translation>Profondità media/e</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
+        <source>Mean depth/s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
         <source>Pressure I</source>
         <translation>Pressione I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
         <source>User entered</source>
         <translation>Inserito dall&apos;utente</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
         <source>Cylinder index</source>
         <translation>Indice della bombola</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
         <source>Ceiling</source>
         <translation>Ceiling</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
         <source>SAC</source>
         <translation>CAS</translation>
     </message>
@@ -2069,127 +2245,127 @@ il computer selezionato?</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1437"/>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1443"/>
+        <location filename="../qt-ui/models.cpp" line="1489"/>
         <source>#</source>
         <translation>nº</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1440"/>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1492"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1443"/>
-        <location filename="../qt-ui/models.cpp" line="1489"/>
+        <location filename="../qt-ui/models.cpp" line="1449"/>
+        <location filename="../qt-ui/models.cpp" line="1495"/>
         <source>Rating</source>
         <translation>Valutazione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1452"/>
         <source>Depth</source>
         <translation>Profondità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1458"/>
         <source>Temp</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1461"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>SAC</source>
         <translation>CAS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>Weight(%1)</source>
         <translation>Peso(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1458"/>
-        <location filename="../qt-ui/models.cpp" line="1504"/>
+        <location filename="../qt-ui/models.cpp" line="1464"/>
+        <location filename="../qt-ui/models.cpp" line="1510"/>
         <source>Suit</source>
         <translation>Muta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1461"/>
-        <location filename="../qt-ui/models.cpp" line="1507"/>
+        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1513"/>
         <source>Cyl</source>
         <translation>Bombola</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1464"/>
-        <location filename="../qt-ui/models.cpp" line="1510"/>
+        <location filename="../qt-ui/models.cpp" line="1470"/>
+        <location filename="../qt-ui/models.cpp" line="1516"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>SAC(%1)</source>
         <translation>CAS(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1473"/>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1527"/>
         <source>Max CNS</source>
         <translation>CNS massimo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
-        <location filename="../qt-ui/models.cpp" line="1524"/>
+        <location filename="../qt-ui/models.cpp" line="1482"/>
+        <location filename="../qt-ui/models.cpp" line="1530"/>
         <source>Location</source>
         <translation>Luogo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>Depth(%1)</source>
         <translation>Prof. (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1449"/>
-        <location filename="../qt-ui/models.cpp" line="1495"/>
+        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1501"/>
         <source>Duration</source>
         <translation>Durata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1498"/>
+        <location filename="../qt-ui/models.cpp" line="1504"/>
         <source>Temp(%1%2)</source>
         <translation>Temp (%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1470"/>
-        <location filename="../qt-ui/models.cpp" line="1518"/>
+        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1524"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -2197,95 +2373,95 @@ il computer selezionato?</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="98"/>
         <source>no dives were selected</source>
         <translation>nessuna immersione è selezionata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="117"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>Creazione del file zip per il caricamento fallita: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="143"/>
         <source>cannot create temporary file: %s</source>
         <translation>Non è stato possibile creare il file temporaneo: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/>
         <source>internal error: %s</source>
         <translation>Errore dell&apos;applicazione: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="169"/>
         <source>internal error</source>
         <translation>errore interno</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="629"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="828"/>
         <source>Done</source>
         <translation>Fatto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/>
         <source>Uploading dive list...</source>
         <translation>Sto caricando la lista immersioni...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="692"/>
         <source>Downloading dive list...</source>
         <translation>Sto scaricando la lista immersioni...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="741"/>
         <source>Downloading %1 dives...</source>
         <translation>Sto scaricando %1 immersioni...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="785"/>
         <source>Download finished - %1</source>
         <translation>Scaricamento finito - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="802"/>
         <source>Corrupted download</source>
         <translation>Scaricamento corrotto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>L&apos;archivio non può essere aperto:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
         <source>Upload failed</source>
         <translation>Caricamento fallito</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/>
         <source>Upload successful</source>
         <translation>Caricamento eseguito</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
         <source>Login failed</source>
         <translation>Accesso fallito</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
         <source>Cannot parse response</source>
         <translation>Non riesco ad analizzare la risposta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
         <source>Error: %1</source>
         <translation>Errore: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="829"/>
         <source>Upload finished</source>
         <translation>Caricamento finito</translation>
     </message>
@@ -2293,54 +2469,52 @@ il computer selezionato?</translation>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="169"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="400"/>
         <source>Retry</source>
         <translation>Riprova</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="264"/>
         <source>Find Uemis dive computer</source>
         <translation>Cerca computer Uemis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Scegli il file per scaricare il log dal computer subacqueo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Log files (*.log)</source>
         <translation>Files di Log (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="362"/>
         <source>Warning</source>
         <translation>Avviso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="363"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>Il salvataggio del dump di libdivecomputer NON inserirà le immersioni nella lista delle immersioni.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="374"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Scegli il file di dump per il computer subacqueo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="375"/>
         <source>Dump files (*.bin)</source>
         <translation>File di dump (*.bin)</translation>
     </message>
@@ -2348,7 +2522,7 @@ il computer selezionato?</translation>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="101"/>
         <source>Vendor</source>
         <translation>Venditore</translation>
     </message>
@@ -2358,54 +2532,74 @@ il computer selezionato?</translation>
         <translation>Scarica dal computer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="31"/>
         <source>Device or mount point</source>
         <translation>Periferica o punto di mount</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="111"/>
         <source>Dive computer</source>
         <translation>Computer subacqueo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="132"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="45"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="80"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="94"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="52"/>
         <source>Force download of all dives</source>
         <translation>Forza il download di tutte le immersioni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
         <source>Always prefer downloaded dives</source>
         <translation>Preferisci sempre le immersioni scaricate</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="189"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/>
+        <source>Downloaded Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
+        <source>Select all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
+        <source>Unselect all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
         <source>Save libdivecomputer logfile</source>
         <translation>Salva il file di log di libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="87"/>
         <source>Save libdivecomputer dumpfile</source>
         <translation>Salva il file di dump di libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
         <source>Download into new trip</source>
         <translation>Scarica in un nuovo viaggio</translation>
     </message>
@@ -2413,12 +2607,12 @@ il computer selezionato?</translation>
 <context>
     <name>ExtraDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Key</source>
         <translation>Chiave</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Value</source>
         <translation>Valore</translation>
     </message>
@@ -2432,22 +2626,20 @@ il computer selezionato?</translation>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="245"/>
-        <source>Your dive profile was updated to facebook.</source>
-        <translation>Il tuo profilo di immersione è stato caricato su Facebook con successo.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
-        <source>Photo Upload Failed</source>
-        <translation>Caricamento delle foto fallito</translation>
+        <source>Your dive profile was updated to Facebook.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="250"/>
-        <source>Your dive profile was not updated to facebook, 
+        <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
-        <translation>Il tuo profilo di immersione non è stato caricato su Facebook,
-invia il testo che segue ai programmatori.
-</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+        <source>Photo Upload Failed</source>
+        <translation>Caricamento delle foto fallito</translation>
     </message>
 </context>
 <context>
@@ -2489,17 +2681,17 @@ invia il testo che segue ai programmatori.
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1544"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1621"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Questa funzionalità non è ancora disponibile per il computer selezionato.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1624"/>
         <source>Firmware update failed!</source>
         <translation>Aggiornamento del firmware fallito!</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1550"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1627"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Non è stato possibile collegarsi al computer subacqueo.</translation>
     </message>
@@ -2507,7 +2699,7 @@ invia il testo che segue ai programmatori.
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="128"/>
+        <location filename="../qt-ui/globe.cpp" line="119"/>
         <source>Edit selected dive locations</source>
         <translation>Modifica i luoghi selezionati</translation>
     </message>
@@ -2515,7 +2707,7 @@ invia il testo che segue ai programmatori.
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="566"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="549"/>
         <source>Location: </source>
         <translation>Luogo:</translation>
     </message>
@@ -2523,7 +2715,7 @@ invia il testo che segue ai programmatori.
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="286"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="283"/>
         <source>No location set</source>
         <translation>Nessun luogo impostato</translation>
     </message>
@@ -2531,330 +2723,335 @@ invia il testo che segue ai programmatori.
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="133"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
+        <location filename="../qt-ui/maintab.cpp" line="497"/>
         <source>Location</source>
         <translation>Luogo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="67"/>
         <source>Coordinates</source>
         <translation>Coordinate</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="169"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="154"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Buddy</source>
         <translation>Compagno</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="222"/>
+        <location filename="../qt-ui/maintab.ui" line="277"/>
         <source>Tags</source>
         <translation>Tags</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="186"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
         <source>Rating</source>
         <translation>Valutazione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="221"/>
         <source>Visibility</source>
         <translation>Visibilità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="230"/>
         <source>Suit</source>
         <translation>Muta</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="465"/>
+        <location filename="../qt-ui/maintab.cpp" line="470"/>
         <source>Dive notes</source>
         <translation>Note di immersione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
-        <location filename="../qt-ui/maintab.ui" line="648"/>
-        <location filename="../qt-ui/maintab.cpp" line="277"/>
+        <location filename="../qt-ui/maintab.ui" line="74"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="102"/>
+        <location filename="../qt-ui/maintab.ui" line="677"/>
+        <location filename="../qt-ui/maintab.cpp" line="279"/>
         <source>Air temp.</source>
         <translation>Temperatura atmosferica</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <location filename="../qt-ui/maintab.ui" line="667"/>
-        <location filename="../qt-ui/maintab.cpp" line="278"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.ui" line="696"/>
+        <location filename="../qt-ui/maintab.cpp" line="280"/>
         <source>Water temp.</source>
         <translation>Temperatura dell&apos;acqua</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="229"/>
-        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.ui" line="284"/>
+        <location filename="../qt-ui/maintab.cpp" line="498"/>
         <source>Notes</source>
         <translation>Note</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="369"/>
+        <location filename="../qt-ui/maintab.ui" line="398"/>
         <source>Equipment</source>
         <translation>Attrezzatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="496"/>
+        <location filename="../qt-ui/maintab.ui" line="525"/>
         <source>Gases used</source>
         <translation>Gas utilizzati</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="515"/>
+        <location filename="../qt-ui/maintab.ui" line="544"/>
         <source>Gas consumed</source>
         <translation>Gas consumati</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="553"/>
+        <location filename="../qt-ui/maintab.ui" line="582"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="591"/>
+        <location filename="../qt-ui/maintab.ui" line="620"/>
         <source>Max. depth</source>
         <translation>Profondità massima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="629"/>
+        <location filename="../qt-ui/maintab.ui" line="658"/>
         <source>Air pressure</source>
         <translation>Pressione atmosferica</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="686"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>Dive time</source>
         <translation>Tempo di immersione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="845"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
         <source>Total time</source>
         <translation>Tempo totale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="903"/>
+        <location filename="../qt-ui/maintab.ui" line="932"/>
         <source>Gas consumption</source>
         <translation>Consumo gas </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="962"/>
+        <location filename="../qt-ui/maintab.ui" line="991"/>
         <source>Extra data</source>
         <translation>Dati extra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="968"/>
+        <location filename="../qt-ui/maintab.ui" line="997"/>
         <source>Additional data from dive computer</source>
         <translation>Dati aggiuntivi dal computer subacqueo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="54"/>
-        <location filename="../qt-ui/maintab.ui" line="458"/>
+        <location filename="../qt-ui/maintab.ui" line="83"/>
+        <location filename="../qt-ui/maintab.ui" line="487"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="61"/>
+        <location filename="../qt-ui/maintab.ui" line="90"/>
         <source>Time</source>
         <translation>Ora</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="425"/>
+        <location filename="../qt-ui/maintab.ui" line="454"/>
         <source>Dive info</source>
         <translation>Informazioni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="477"/>
+        <location filename="../qt-ui/maintab.ui" line="506"/>
         <source>Interval</source>
         <translation>Intervallo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="534"/>
-        <location filename="../qt-ui/maintab.ui" line="799"/>
+        <location filename="../qt-ui/maintab.ui" line="563"/>
+        <location filename="../qt-ui/maintab.ui" line="828"/>
         <source>SAC</source>
         <translation>CAS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="610"/>
+        <location filename="../qt-ui/maintab.ui" line="639"/>
         <source>Avg. depth</source>
         <translation>Profondità media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="572"/>
+        <location filename="../qt-ui/maintab.ui" line="601"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="734"/>
         <source>Salinity</source>
         <translation>Salinità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="742"/>
+        <location filename="../qt-ui/maintab.ui" line="771"/>
         <source>Stats</source>
         <translation>Statistiche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="775"/>
+        <location filename="../qt-ui/maintab.ui" line="804"/>
         <source>Depth</source>
         <translation>Profondità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="787"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="813"/>
+        <location filename="../qt-ui/maintab.ui" line="842"/>
         <source>Duration</source>
         <translation>Durata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="864"/>
+        <location filename="../qt-ui/maintab.ui" line="893"/>
         <source>Dives</source>
         <translation>Immersioni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="948"/>
+        <location filename="../qt-ui/maintab.ui" line="977"/>
         <source>Photos</source>
         <translation>Foto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="95"/>
+        <location filename="../qt-ui/maintab.cpp" line="87"/>
         <source>Cylinders</source>
         <translation>Bombole</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="99"/>
+        <location filename="../qt-ui/maintab.cpp" line="91"/>
         <source>Weights</source>
         <translation>Pesi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="55"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Apply changes</source>
         <translation>Applica le modifiche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="59"/>
+        <location filename="../qt-ui/maintab.cpp" line="50"/>
         <source>Discard changes</source>
         <translation>Elimina le modifiche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="96"/>
+        <location filename="../qt-ui/maintab.cpp" line="88"/>
         <source>Add cylinder</source>
         <translation>Aggiungi bombola</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="100"/>
+        <location filename="../qt-ui/maintab.cpp" line="92"/>
         <source>Add weight system</source>
         <translation>Aggiungi la tipologia della pesata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="274"/>
+        <location filename="../qt-ui/maintab.cpp" line="276"/>
         <source>Air temp. [%1]</source>
         <translation>Temp. aria [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="275"/>
+        <location filename="../qt-ui/maintab.cpp" line="277"/>
         <source>Water temp. [%1]</source>
         <translation>Temp. acqua [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="312"/>
+        <location filename="../qt-ui/maintab.cpp" line="314"/>
         <source>This trip is being edited.</source>
         <translation>Questo viaggio è stato editato.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="320"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Multiple dives are being edited.</source>
         <translation>Si stanno modificando immersioni multiple.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.cpp" line="324"/>
         <source>This dive is being edited.</source>
         <translation>Si sta modificando questa immersione </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="436"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
+        <location filename="../qt-ui/maintab.cpp" line="465"/>
         <source>Trip notes</source>
         <translation>Note di viaggio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="458"/>
+        <location filename="../qt-ui/maintab.cpp" line="463"/>
         <source>Trip location</source>
         <translation>Luogo del viaggio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="526"/>
-        <location filename="../qt-ui/maintab.cpp" line="558"/>
-        <location filename="../qt-ui/maintab.cpp" line="562"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
         <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="574"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="555"/>
+        <location filename="../qt-ui/maintab.cpp" line="563"/>
         <source>Deepest dive</source>
         <translation>Immersione più profonda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="556"/>
+        <location filename="../qt-ui/maintab.cpp" line="564"/>
         <source>Shallowest dive</source>
         <translation>Immersione più superficiale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="569"/>
+        <location filename="../qt-ui/maintab.cpp" line="577"/>
         <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="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="578"/>
         <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="571"/>
+        <location filename="../qt-ui/maintab.cpp" line="579"/>
         <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="582"/>
+        <location filename="../qt-ui/maintab.cpp" line="590"/>
         <source>Highest temperature</source>
         <translation>Temperatura più alta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="583"/>
+        <location filename="../qt-ui/maintab.cpp" line="591"/>
         <source>Lowest temperature</source>
         <translation>Temperatura più bassa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="584"/>
+        <location filename="../qt-ui/maintab.cpp" line="592"/>
         <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="594"/>
+        <location filename="../qt-ui/maintab.cpp" line="602"/>
         <source>Longest dive</source>
         <translation>Immersione più lunga</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="595"/>
+        <location filename="../qt-ui/maintab.cpp" line="603"/>
         <source>Shortest dive</source>
         <translation>Immersione più corta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="596"/>
+        <location filename="../qt-ui/maintab.cpp" line="604"/>
         <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="620"/>
+        <location filename="../qt-ui/maintab.cpp" line="628"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -2863,17 +3060,17 @@ mixati con aria e usando:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="624"/>
+        <location filename="../qt-ui/maintab.cpp" line="632"/>
         <source> and </source>
         <translation>e</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="911"/>
+        <location filename="../qt-ui/maintab.cpp" line="925"/>
         <source>Discard the changes?</source>
         <translation>Elimino le modifiche?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="912"/>
+        <location filename="../qt-ui/maintab.cpp" line="926"/>
         <source>You are about to discard your changes.</source>
         <translation>Stai per cancellare le modifiche.</translation>
     </message>
@@ -3020,7 +3217,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="296"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="232"/>
         <source>Open</source>
         <translation>Apri</translation>
     </message>
@@ -3380,90 +3577,90 @@ p, li { white-space: pre-wrap; }
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="252"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="229"/>
         <source>Open file</source>
         <translation>Apri file</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="256"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="233"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="332"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="309"/>
         <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="444"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
         <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="491"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
         <source>Print runtime table</source>
         <translation>Stampa la tabella con il runtime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="834"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="811"/>
         <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="836"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="813"/>
         <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="841"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="818"/>
         <source>Save changes?</source>
         <translation>Salvo le modifiche?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1196"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1173"/>
         <source>Save file as</source>
         <translation>Apri file come</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1337"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1314"/>
         <source>Open dive log file</source>
         <translation>Apri file di log immersioni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="819"/>
         <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="300"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="444"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="277"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Warning</source>
         <translation>Avviso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1180"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1157"/>
         <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="625"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="602"/>
         <source>Yearly statistics</source>
         <translation>Statistiche Annuali</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1197"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1174"/>
         <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="1338"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1315"/>
         <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source>
         <translation>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <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>
@@ -3471,7 +3668,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="651"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="634"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>I Filtri mostrano %1 (di %2) immersioni</translation>
     </message>
@@ -3479,12 +3676,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="239"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation>Dovresti aggiornare il firmware sul tuo computer: hai la versione %1 ma la versione stabile più recente è %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="243"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
@@ -3493,27 +3690,27 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiornamento, esegui le stesse operazioni che fai per scaricare il logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="244"/>
         <source>Not now</source>
         <translation>Non adesso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="245"/>
         <source>Update firmware</source>
         <translation>Aggiorna il firmware</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
         <source>Firmware upgrade notice</source>
         <translation>Avviso di aggiornamento del firmware</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
         <source>Save the downloaded firmware as</source>
         <translation>Salva il firmware scaricato come</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
         <source>HEX files (*.hex)</source>
         <translation>HEX files (*.hex)</translation>
     </message>
@@ -3521,54 +3718,69 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Open circuit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>ft/min</source>
         <translation>piedi/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="481"/>
         <source>Last stop at 20ft</source>
         <translation>Ultima sosta a 20 piedi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="482"/>
         <source>50% avg. depth to 20ft</source>
         <translation>Dal 50% della prof. media a 20ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="489"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
         <source>20ft to surface</source>
         <translation>20 piedi alla superficie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="485"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
         <source>Last stop at 6m</source>
         <translation>Ultima sosta a 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
         <source>50% avg. depth to 6m</source>
         <translation>Dal 50% della prof. media a 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="494"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
         <source>6m to surface</source>
         <translation>6m alla superficie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="497"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="498"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
         <source>cuft/min</source>
         <translation>cuft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="506"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="507"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="500"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="501"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
@@ -3687,6 +3899,7 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="816"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -3721,57 +3934,87 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="795"/>
+        <source>CCR: Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="809"/>
+        <source>Default CCR set-point for dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="832"/>
+        <source>pSCR O₂ metabolism rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="839"/>
+        <source>pSCR ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="846"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="859"/>
+        <source>1:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="875"/>
         <source>System default</source>
         <translation>Impostazione di sistema predefinita</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="843"/>
+        <location filename="../qt-ui/preferences.ui" line="914"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="849"/>
+        <location filename="../qt-ui/preferences.ui" line="920"/>
         <source>Proxy type</source>
         <translation>Tipo di proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="862"/>
+        <location filename="../qt-ui/preferences.ui" line="933"/>
         <source>Host</source>
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="888"/>
+        <location filename="../qt-ui/preferences.ui" line="959"/>
         <source>Port</source>
         <translation>Porta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="914"/>
+        <location filename="../qt-ui/preferences.ui" line="985"/>
         <source>Requires authentication</source>
         <translation>Richiede autenticazione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="934"/>
+        <location filename="../qt-ui/preferences.ui" line="1005"/>
         <source>Username</source>
         <translation>Nome utente</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="957"/>
+        <location filename="../qt-ui/preferences.ui" line="1028"/>
         <source>Password</source>
         <translation>Password</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="985"/>
-        <source>about:blank</source>
-        <translation>about:blank</translation>
+        <location filename="../qt-ui/preferences.ui" line="1079"/>
+        <source>Disconnect from Facebook</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1011"/>
-        <source>Disconnect from facebook</source>
-        <translation>Scollegati da Facebook</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="824"/>
+        <location filename="../qt-ui/preferences.ui" line="895"/>
         <source>Filter</source>
         <translation>Filtro</translation>
     </message>
@@ -3926,52 +4169,52 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="28"/>
+        <location filename="../qt-ui/preferences.cpp" line="44"/>
         <source>No proxy</source>
         <translation>Nessun proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="29"/>
+        <location filename="../qt-ui/preferences.cpp" line="45"/>
         <source>System proxy</source>
         <translation>Proxy di sistema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="30"/>
+        <location filename="../qt-ui/preferences.cpp" line="46"/>
         <source>HTTP proxy</source>
         <translation>Proxy HTTP</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="31"/>
+        <location filename="../qt-ui/preferences.cpp" line="47"/>
         <source>SOCKS proxy</source>
         <translation>Proxy SOCKS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="291"/>
+        <location filename="../qt-ui/preferences.cpp" line="324"/>
         <source>Restart required</source>
         <translation>Richiesto riavvio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="292"/>
+        <location filename="../qt-ui/preferences.cpp" line="325"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>Per caricare correttamente la nuova lingua è richiesto il riavvio di Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="456"/>
+        <location filename="../qt-ui/preferences.cpp" line="494"/>
         <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
         <translation>Se clicchi OK, tutte le impostazionei di Subsurface verranno riportate ai loro valori di default. La modifica sarà immediata.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>File XML Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Open default log file</source>
         <translation>Apri il log delle immersioni di default</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="455"/>
+        <location filename="../qt-ui/preferences.cpp" line="493"/>
         <source>Warning</source>
         <translation>Avviso</translation>
     </message>
@@ -3979,17 +4222,17 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="91"/>
+        <location filename="../qt-ui/printdialog.cpp" line="85"/>
         <source>&amp;Preview</source>
         <translation>&amp;Anteprima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="88"/>
+        <location filename="../qt-ui/printdialog.cpp" line="82"/>
         <source>P&amp;rint</source>
         <translation>&amp;Stampa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="103"/>
+        <location filename="../qt-ui/printdialog.cpp" line="97"/>
         <source>Print</source>
         <translation>Stampa</translation>
     </message>
@@ -3997,42 +4240,42 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="20"/>
         <source>Dive#</source>
         <translation>Immersione nº</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="21"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="22"/>
         <source>Depth</source>
         <translation>Profondità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="23"/>
         <source>Duration</source>
         <translation>Durata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Master</source>
         <translation>Master</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Buddy</source>
         <translation>Compagno</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="34"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Location</source>
         <translation>Luogo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <location filename="../qt-ui/printlayout.cpp" line="63"/>
         <source>Subsurface cannot find a usable printer on this system!</source>
         <translation>Subsurface non trova una stampante adatta su questo computer!</translation>
     </message>
@@ -4098,72 +4341,72 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2095"/>
+        <location filename="../qt-ui/models.cpp" line="2101"/>
         <source>unknown</source>
         <translation>sconosciuto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2100"/>
+        <location filename="../qt-ui/models.cpp" line="2106"/>
         <source>Dive #%1 - %2</source>
         <translation>Immersione nº%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2103"/>
+        <location filename="../qt-ui/models.cpp" line="2109"/>
         <source>Max depth: %1 %2</source>
         <translation>Massima profondità: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2110"/>
+        <location filename="../qt-ui/models.cpp" line="2116"/>
         <source>Duration: %1 min</source>
         <translation>Durata: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2115"/>
+        <location filename="../qt-ui/models.cpp" line="2121"/>
         <source>Gas used:</source>
         <translation>Gas usato:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2117"/>
+        <location filename="../qt-ui/models.cpp" line="2123"/>
         <source>Tags:</source>
         <translation>Tags:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2119"/>
+        <location filename="../qt-ui/models.cpp" line="2125"/>
         <source>SAC:</source>
         <translation>CAS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2121"/>
+        <location filename="../qt-ui/models.cpp" line="2127"/>
         <source>Weights:</source>
         <translation>Pesi:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2126"/>
+        <location filename="../qt-ui/models.cpp" line="2132"/>
         <source>Notes:</source>
         <translation>Note:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2133"/>
+        <location filename="../qt-ui/models.cpp" line="2139"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2135"/>
+        <location filename="../qt-ui/models.cpp" line="2141"/>
         <source>Buddy:</source>
         <translation>Compagno:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2137"/>
+        <location filename="../qt-ui/models.cpp" line="2143"/>
         <source>Suit:</source>
         <translation>Muta:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2139"/>
+        <location filename="../qt-ui/models.cpp" line="2145"/>
         <source>Viz:</source>
         <translation>Visibilità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2141"/>
+        <location filename="../qt-ui/models.cpp" line="2147"/>
         <source>Rating:</source>
         <translation>Valutazione:</translation>
     </message>
@@ -4171,103 +4414,108 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="628"/>
         <source> (#%1 of %2)</source>
         <translation>(nº%1 of %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="630"/>
+        <source>Unknown dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="647"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>La visualizzazione NDL / TTS è stata disabilitata perchè i calcoli richiedono troppo tempo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1168"/>
         <source>Make first divecomputer</source>
         <translation>Rendilo computer principale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Delete this divecomputer</source>
         <translation>Cancella questo computer subacqueo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1184"/>
         <source>Add gas change</source>
         <translation>Aggiungi un cambio gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1187"/>
         <source> (Tank %1)</source>
         <translation>(Bombola %1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1195"/>
         <source>Add set-point change</source>
         <translation>Aggiungi un cambio di set-point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1197"/>
         <source>Add bookmark</source>
         <translation>Aggiungi un segnalibro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
         <source>Remove event</source>
         <translation>Rimuovi evento</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1206"/>
         <source>Hide similar events</source>
         <translation>Nascondi eventi simili</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1213"/>
         <source>Edit name</source>
         <translation>Modifica il nome</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1242"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1249"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>Corregge la pressione della bombola %1 (attualmente interpolata come %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1264"/>
         <source>Unhide all events</source>
         <translation>Mostra tutti gli eventi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide events</source>
         <translation>Nascondi gli eventi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide all %1 events?</source>
         <translation>Nascondi tutti gli eventi %1?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1333"/>
         <source>Remove the selected event?</source>
         <translation>Rimuovere l&apos;evento selezionato?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1334"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1424"/>
         <source>Edit name of bookmark</source>
         <translation>Modifica il nome del bookmark</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
         <source>Custom name:</source>
         <translation>Nome personalizzato:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1430"/>
         <source>Name is too long!</source>
         <translation>Il nome è troppo lungo</translation>
     </message>
@@ -4275,102 +4523,102 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>AIR</source>
         <translation>ARIA</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>OXYGEN</source>
         <translation>OSSIGENO</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="208"/>
         <source>Remove this point</source>
         <translation>Rimuovi questo punto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="57"/>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="42"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="25"/>
         <source>Average</source>
         <translation>Media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="45"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="28"/>
         <source>Minimum</source>
         <translation>Minimo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="48"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="31"/>
         <source>Maximum</source>
         <translation>Massimo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="297"/>
+        <location filename="../qt-ui/globe.cpp" line="296"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>Spostare la mappa e fare doppio-click per definire la posizione dell&apos;immersione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="525"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="526"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="550"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="551"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="570"/>
+        <location filename="../qt-ui/models.cpp" line="574"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="571"/>
+        <location filename="../qt-ui/models.cpp" line="575"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="595"/>
+        <location filename="../qt-ui/models.cpp" line="599"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="596"/>
+        <location filename="../qt-ui/models.cpp" line="600"/>
         <source>cuft</source>
         <translation>piedi cubi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="513"/>
         <source>Invalid response from server</source>
         <translation>Risposta non valida dal server</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation>Tag XML atteso &apos;DiveDateReader&apos;, trovato invece &apos;%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="567"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation>Tag XML atteso &apos;DiveDateReader&apos; non trovato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Risposta XML malformata. Linea %1: %2</translation>
     </message>
@@ -4378,12 +4626,12 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1450"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1518"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Questa funzionalità non è ancora disponibile per questo computer.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1442"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Non è stato possibile connettersi al computer subacqueo.</translation>
     </message>
@@ -4397,12 +4645,12 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
-        <location filename="../qt-ui/simplewidgets.cpp" line="151"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="134"/>
         <source>New starting number</source>
         <translation>Nuovo numero di inizio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="149"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="132"/>
         <source>New number</source>
         <translation>Nuovo numero</translation>
     </message>
@@ -4410,12 +4658,12 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1575"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1653"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Questa funzionalità non è ancora disponibile per il computer selezionato.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1579"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1657"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Non è stato possibile connettersi al computer subacqueo.</translation>
     </message>
@@ -4494,12 +4742,12 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
         <translation>Quale data ed orario sono mostrati nell&apos;immagine?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="276"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="259"/>
         <source>Open image file</source>
         <translation>Apri il file dell&apos;immagine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="278"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="261"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Files immagine (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -4552,10 +4800,9 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
     <name>SocialNetworkDialog</name>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="282"/>
-        <source>Dive Date: %1 
+        <source>Dive date: %1 
 </source>
-        <translation>Data dell&apos;immersione: %1 
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="285"/>
@@ -4578,10 +4825,9 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="290"/>
-        <source>Dive Location: %1 
+        <source>Dive location: %1 
 </source>
-        <translation>Luogo di immersione: %1 
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="293"/>
@@ -4699,47 +4945,47 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="329"/>
         <source>Webservice</source>
         <translation>Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="393"/>
         <source>Connecting...</source>
         <translation>In connessione...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
         <source>Download finished</source>
         <translation>Download finito</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Download error: %1</source>
         <translation>Errore scaricamento: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="436"/>
         <source>Connection error: </source>
         <translation>Errore di connessione:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
         <source>Download successful</source>
         <translation>Scaricamento eseguito</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="439"/>
         <source>Invalid user identifier!</source>
         <translation>Identificatore dell&apos;utente non valido!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="312"/>
         <source>Enter User ID and click Download</source>
         <translation>Inserisci la User ID e click Download</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="442"/>
         <source>Cannot parse response!</source>
         <translation>Non posso analizzare la risposta!</translation>
     </message>
@@ -4747,7 +4993,7 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="592"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="575"/>
         <source>Suits: </source>
         <translation>Mute:</translation>
     </message>
@@ -4755,7 +5001,7 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="119"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="116"/>
         <source>No suit set</source>
         <translation>Nessun set di mute</translation>
     </message>
@@ -4772,7 +5018,7 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="513"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="496"/>
         <source>Tags: </source>
         <translation>Tag:</translation>
     </message>
@@ -4780,7 +5026,7 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="144"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="141"/>
         <source>Empty tags</source>
         <translation>Tag vuoti</translation>
     </message>
@@ -4788,17 +5034,17 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>Description</source>
         <translation>Descrizione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -4806,7 +5052,7 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="141"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="131"/>
         <source>Information</source>
         <translation>Informazione</translation>
     </message>
@@ -4814,7 +5060,7 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1090"/>
+        <location filename="../qt-ui/models.cpp" line="1094"/>
         <source> (%1 shown)</source>
         <translation> (%1 mostrati)</translation>
     </message>
@@ -4822,72 +5068,72 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="64"/>
         <source>Check for updates.</source>
         <translation>Controlla gli aggiornamenti.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="66"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface non è riuscito a controllare gli aggiornamenti.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="70"/>
         <source>The following error occurred:</source>
         <translation>Si è verificato il seguente errore:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="72"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
         <source>Please check your internet connection.</source>
         <translation>Per favore controlla la tua connessione Internet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="85"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="84"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>Stai usando la versione più recente di Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="88"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>E&apos; disponibile una nuova versione di Subsurface.&lt;br/&gt;Clicca su:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; per scaricarla.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="95"/>
         <source>A new version of Subsurface is available.</source>
         <translation>E&apos; disponibile una nuova versione di Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="97"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
         <source>Latest version is %1, please check with your OS vendor for updates.</source>
         <translation>La versione più recente è %1, controlla gli aggiornamenti del tuo sistema operativo.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="103"/>
         <source>Newest release version is </source>
         <translation>La versione più recente è</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="105"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
         <source>The server returned the following information:</source>
         <translation>Il server ha restituito le seguenti informazioni:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="121"/>
         <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation>Subsurface controlla la disponibilità di una nuova versione ogni due settimane. Se non vuoi che Subsurface continui a controllare, per favore fai clic su Rifiuta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
         <source>Decline</source>
         <translation>Rifiuta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="124"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
         <source>Accept</source>
         <translation>Accetta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="126"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="125"/>
         <source>Automatic check for updates</source>
         <translation>Controllo automatico degli aggiornamenti</translation>
     </message>
@@ -4895,13 +5141,13 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
 <context>
     <name>UserManual</name>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="55"/>
+        <location filename="../qt-ui/usermanual.cpp" line="54"/>
         <source>User Manual</source>
         <translation>Manuale Utente</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="72"/>
-        <location filename="../qt-ui/usermanual.cpp" line="78"/>
+        <location filename="../qt-ui/usermanual.cpp" line="71"/>
+        <location filename="../qt-ui/usermanual.cpp" line="77"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Manuale di Subsurface non trovato</translation>
     </message>
@@ -4979,85 +5225,85 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
         <translation>Da dove importi i dati di immersione?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
         <source>
 Operating System: %1</source>
         <translation>
  Sistema Operativo: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 Architettura CPU : %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 Language: %1</source>
         <translation>
 Lingua: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="93"/>
         <source>Should we ask you later?</source>
         <translation>Possiamo richiedertelo in seguito?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Don&apos;t ask me again</source>
         <translation>Non chiedermelo di nuovo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Ask later</source>
         <translation>Chiedi in seguto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
         <source>Submit user survey.</source>
         <translation>Invia il sondaggio.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask again?</source>
         <translation>Chiedo di nuovo?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="17"/>
         <source>Send</source>
         <translation>Invia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>
 OS Architettura CPU: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation>Subsurface non è stato in grado di inviare il sondaggio.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="121"/>
         <source>The following error occurred:</source>
         <translation>Si è verificato il seguente errore:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>Please check your internet connection.</source>
         <translation>Per favore controlla la tua connessione Internet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="131"/>
         <source>Survey successfully submitted.</source>
         <translation>Sondaggio inviato con successo.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="136"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation>S&apos;è verificato un errore nella ricerca degli aggiornamenti.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -5065,12 +5311,12 @@ OS Architettura CPU: %1</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>Description</source>
         <translation>Descrizione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -5118,12 +5364,12 @@ OS Architettura CPU: %1</translation>
         <translation>Invia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="247"/>
         <source>Operation timed out</source>
         <translation>L&apos;operazione è durata troppo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="268"/>
         <source>Transferring data...</source>
         <translation>Trasferimenti dati...</translation>
     </message>
@@ -5131,17 +5377,17 @@ OS Architettura CPU: %1</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="496"/>
+        <location filename="../qt-ui/models.cpp" line="500"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Cliccando qui verrà rimossa la zavorra.</translation>
     </message>
@@ -5149,19 +5395,19 @@ OS Architettura CPU: %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1479"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1487"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1497"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1555"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1566"/>
         <source>Failed!</source>
         <translation>Operazione non riuscita!</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1506"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1576"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Questa funzionalità non è ancora disponibile per il computer selezionato.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1580"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Non è stato possibile connettersi al computer subacqueo.</translation>
     </message>
@@ -5169,79 +5415,79 @@ OS Architettura CPU: %1</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1841"/>
+        <location filename="../qt-ui/models.cpp" line="1847"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Anno 
 &gt; Mese / Viaggio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1844"/>
+        <location filename="../qt-ui/models.cpp" line="1850"/>
         <source>#</source>
         <translation>n</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1847"/>
+        <location filename="../qt-ui/models.cpp" line="1853"/>
         <source>Duration 
  Total</source>
         <translation>Durata 
 Totale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1850"/>
+        <location filename="../qt-ui/models.cpp" line="1856"/>
         <source>
 Average</source>
         <translation>
 Media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1853"/>
+        <location filename="../qt-ui/models.cpp" line="1859"/>
         <source>
 Shortest</source>
         <translation>
 Più corta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1856"/>
+        <location filename="../qt-ui/models.cpp" line="1862"/>
         <source>
 Longest</source>
         <translation>
 Più lunga</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1859"/>
+        <location filename="../qt-ui/models.cpp" line="1865"/>
         <source>Depth (%1)
  Average</source>
         <translation>Profondità (%1)
 Media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1862"/>
-        <location filename="../qt-ui/models.cpp" line="1871"/>
-        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>
 Minimum</source>
         <translation>
 Minimo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1865"/>
-        <location filename="../qt-ui/models.cpp" line="1874"/>
-        <location filename="../qt-ui/models.cpp" line="1883"/>
+        <location filename="../qt-ui/models.cpp" line="1871"/>
+        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>
 Maximum</source>
         <translation>
 Massimo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1874"/>
         <source>SAC (%1)
  Average</source>
         <translation>CAS(%1)
 Media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1883"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -5322,40 +5568,40 @@ Media</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1508"/>
+        <location filename="../dive.c" line="1530"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) oder (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="464"/>
+        <location filename="../divelist.c" line="467"/>
         <location filename="../equipment.c" line="81"/>
-        <location filename="../planner.c" line="1060"/>
-        <location filename="../planner.c" line="1063"/>
+        <location filename="../planner.c" line="1081"/>
+        <location filename="../planner.c" line="1084"/>
         <source>air</source>
         <translation>aria</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="192"/>
+        <location filename="../equipment.c" line="194"/>
         <source>integrated</source>
         <translation>integrato</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="193"/>
+        <location filename="../equipment.c" line="195"/>
         <source>belt</source>
         <translation>cintura</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="194"/>
+        <location filename="../equipment.c" line="196"/>
         <source>ankle</source>
         <translation>caviglia</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="195"/>
+        <location filename="../equipment.c" line="197"/>
         <source>backplate weight</source>
         <translation>peso della piastra</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="196"/>
+        <location filename="../equipment.c" line="198"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -5363,7 +5609,7 @@ Media</translation>
         <location filename="../file.c" line="112"/>
         <location filename="../file.c" line="434"/>
         <location filename="../file.c" line="506"/>
-        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="925"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Impossibile leggere &apos;%s&apos;</translation>
     </message>
@@ -5420,9 +5666,9 @@ Media</translation>
         <translation>Nessun computer corrispondente per il file &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../file.c" line="869"/>
-        <location filename="../file.c" line="909"/>
-        <location filename="../file.c" line="1007"/>
+        <location filename="../file.c" line="870"/>
+        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="1016"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>Il numero massimo di colonne supportate nel file CSV è di %d</translation>
     </message>
@@ -5593,27 +5839,27 @@ Media</translation>
         <translation>numero evento non valido</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="421"/>
+        <location filename="../libdivecomputer.c" line="419"/>
         <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="427"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Error registering the data</source>
         <translation>Errore registrando la data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="433"/>
         <source>Error parsing the datetime</source>
         <translation>Errore analizzando la data/il tempo</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Dive %d: %s</source>
         <translation>Immersione #%d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="455"/>
+        <location filename="../libdivecomputer.c" line="454"/>
         <source>Error parsing the divetime</source>
         <translation>Errore analizzando il tempo di immersione</translation>
     </message>
@@ -5623,82 +5869,82 @@ Media</translation>
         <translation>Errore analizzando la profondità massima</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="482"/>
+        <location filename="../libdivecomputer.c" line="483"/>
         <source>Error parsing temperature</source>
         <translation>Errore analizzando la temperatura</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="501"/>
+        <location filename="../libdivecomputer.c" line="503"/>
         <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="513"/>
+        <location filename="../libdivecomputer.c" line="515"/>
         <source>Error obtaining water salinity</source>
         <translation>Errore nell&apos;ottenimento della salinità dell&apos;acqua</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="521"/>
+        <location filename="../libdivecomputer.c" line="524"/>
         <source>Error obtaining surface pressure</source>
         <translation>Errore nell&apos;ottenere la pressione superficiale</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="545"/>
+        <location filename="../libdivecomputer.c" line="549"/>
         <source>Error obtaining divemode</source>
         <translation>Errore nell&apos;ottenere la modalità di immersione</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="562"/>
+        <location filename="../libdivecomputer.c" line="569"/>
         <source>Error parsing the gas mix</source>
         <translation>Errore analizzando la miscela di gas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="569"/>
+        <location filename="../libdivecomputer.c" line="576"/>
         <source>Error parsing the samples</source>
         <translation>Errore analizzando i campioni</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="706"/>
+        <location filename="../libdivecomputer.c" line="713"/>
         <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="714"/>
+        <location filename="../libdivecomputer.c" line="721"/>
         <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="778"/>
+        <location filename="../libdivecomputer.c" line="785"/>
         <source>Error registering the event handler.</source>
         <translation>Errore registrando il gestore degli eventi.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="783"/>
+        <location filename="../libdivecomputer.c" line="790"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Errore registrando il gestore della cancellazione.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="804"/>
+        <location filename="../libdivecomputer.c" line="811"/>
         <source>Dive data import error</source>
         <translation>Errore importazione dati immersione</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="843"/>
+        <location filename="../libdivecomputer.c" line="850"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Impossibile creare un contesto libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="850"/>
+        <location filename="../libdivecomputer.c" line="857"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Impossibile aprire %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="858"/>
+        <location filename="../libdivecomputer.c" line="865"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Privilegi insufficienti per aprire il dispositivo %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="506"/>
+        <location filename="../parse-xml.c" line="516"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Lettura di strane percentuali %s
@@ -5706,84 +5952,84 @@ Media</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1760"/>
+        <location filename="../parse-xml.c" line="1770"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Impossibile analizzare  &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1989"/>
-        <location filename="../parse-xml.c" line="2137"/>
+        <location filename="../parse-xml.c" line="1999"/>
+        <location filename="../parse-xml.c" line="2147"/>
         <source>Database query dm4_events failed.
 </source>
         <translation>Database query dm4_events non riuscita.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1996"/>
-        <location filename="../parse-xml.c" line="2144"/>
+        <location filename="../parse-xml.c" line="2006"/>
+        <location filename="../parse-xml.c" line="2154"/>
         <source>Database query dm4_tags failed.
 </source>
         <translation>Database query dm4_tags non riuscita.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2318"/>
+        <location filename="../parse-xml.c" line="2328"/>
         <source>Database query shearwater_cylinders failed.
 </source>
         <translation>Database query shearwater_cylinders non riuscita.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2325"/>
+        <location filename="../parse-xml.c" line="2335"/>
         <source>Database query shearwater_changes failed.
 </source>
         <translation>Database query shearwater_changes non riuscita.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2332"/>
+        <location filename="../parse-xml.c" line="2342"/>
         <source>Database query shearwater_profile_sample failed.
 </source>
         <translation>Database query shearwater_profile_sample non riuscita.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2451"/>
+        <location filename="../parse-xml.c" line="2461"/>
         <source>Database query cobalt_cylinders failed.
 </source>
         <translation>Database query cobalt_cylinders non riuscita.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2458"/>
+        <location filename="../parse-xml.c" line="2468"/>
         <source>Database query cobalt_buddies failed.
 </source>
         <translation>Database query cobalt_buddies non riuscita.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2465"/>
+        <location filename="../parse-xml.c" line="2475"/>
         <source>Database query cobalt_visibility failed.
 </source>
         <translation>Database query cobalt_visibility non riuscita.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2472"/>
+        <location filename="../parse-xml.c" line="2482"/>
         <source>Database query cobalt_location failed.
 </source>
         <translation>Database query cobalt_location non riuscita.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2479"/>
+        <location filename="../parse-xml.c" line="2489"/>
         <source>Database query cobalt_location (site) failed.
 </source>
         <translation>Database query cobalt_location (site) non riuscita.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2486"/>
+        <location filename="../parse-xml.c" line="2496"/>
         <source>Database query cobalt_profile_sample failed.
 </source>
         <translation>Database query cobalt_profile_sample non riuscita.
@@ -5797,17 +6043,17 @@ Media</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2168"/>
-        <location filename="../parse-xml.c" line="2189"/>
-        <location filename="../parse-xml.c" line="2508"/>
-        <location filename="../parse-xml.c" line="2527"/>
+        <location filename="../parse-xml.c" line="2178"/>
+        <location filename="../parse-xml.c" line="2199"/>
+        <location filename="../parse-xml.c" line="2518"/>
+        <location filename="../parse-xml.c" line="2537"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Interrogazione al database fallita &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2848"/>
+        <location filename="../parse-xml.c" line="2909"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Non é possibile aprire il foglio di stile %s</translation>
     </message>
@@ -5817,161 +6063,167 @@ Media</translation>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="820"/>
+        <location filename="../planner.c" line="841"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Non trovo il gas %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="356"/>
+        <location filename="../planner.c" line="363"/>
         <source>Too many gas mixes</source>
         <translation>Troppe miscele gas</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="540"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation>Calcolo della decompressione annullato per tempo eccessivo</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="548"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation>basato su GFlow = %d e GFhigh = %d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="544"/>
+        <location filename="../planner.c" line="551"/>
         <source>Subsurface dive plan</source>
         <translation>Piano di immersione di Subsurface </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="548"/>
+        <location filename="../planner.c" line="555"/>
         <source>depth</source>
         <translation>profondità</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="558"/>
         <source>runtime</source>
         <translation>runtime</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="554"/>
+        <location filename="../planner.c" line="561"/>
         <source>duration</source>
         <translation>durata</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="557"/>
+        <location filename="../planner.c" line="564"/>
         <source>gas</source>
         <translation>gas</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="594"/>
+        <location filename="../planner.c" line="601"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Passare a %.*f %s in %d:%02d min - runtime %d:%02u su %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="602"/>
+        <location filename="../planner.c" line="609"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Passaggio a %.*f %s al %d:%02d min - runtime %d:%02u con %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="615"/>
+        <location filename="../planner.c" line="622"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Rimani a %.*f %s per %d:%02d min - runtime %d:%02u su %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="622"/>
+        <location filename="../planner.c" line="629"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Rimani a %.*f %s per %d:%02d min - runtime %d:%02u con %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="635"/>
+        <location filename="../planner.c" line="642"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="638"/>
-        <location filename="../planner.c" line="642"/>
+        <location filename="../planner.c" line="645"/>
+        <location filename="../planner.c" line="649"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="651"/>
+        <location filename="../planner.c" line="658"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="676"/>
+        <location filename="../planner.c" line="683"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Cambio gas a %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="678"/>
+        <location filename="../planner.c" line="685"/>
         <source>Switch gas to %s</source>
         <translation>Passa al gas %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="697"/>
+        <location filename="../planner.c" line="704"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="699"/>
+        <location filename="../planner.c" line="706"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="710"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Consumo del gas (CCR legs escluse):</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="705"/>
+        <location filename="../planner.c" line="712"/>
         <source>Gas consumption:</source>
         <translation>Consumo gas:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="535"/>
-        <location filename="../planner.c" line="725"/>
-        <location filename="../planner.c" line="730"/>
-        <location filename="../planner.c" line="753"/>
+        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="732"/>
+        <location filename="../planner.c" line="737"/>
+        <location filename="../planner.c" line="762"/>
+        <location filename="../planner.c" line="772"/>
         <source>Warning:</source>
         <translation>Avviso</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="523"/>
+        <location filename="../planner.c" line="530"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
         <translation>DISCLAIMER / AVVISO: QUESTA È UNA NUOVA IMPLEMENTAZIONE DELL&apos;ALGORITMO DI BUHLMANN E DELL&apos;IMPLEMENTAZIONE DEL  PIANO DI IMMERSIONE BASATO SU CIÒ CHE HA RICEVUTO SOLO UNA LIMITATA QUANTITA&apos; DI TEST. E&apos; ALTAMENTE RACCOMANDATO DI NON PIANIFICARE IMMERSIONI BASATE SEMPLICEMENTE SUI RISULTATI DATI QUI.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="726"/>
+        <location filename="../planner.c" line="733"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>il gas necessario è superiore a quello disponibile nella bombola</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="731"/>
+        <location filename="../planner.c" line="738"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>riserva di gas non sufficiente per la condivisione in risalita</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="733"/>
+        <location filename="../planner.c" line="740"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s nella risalita pianificata)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="735"/>
+        <location filename="../planner.c" line="742"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s durante la risalita pianificata) di %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="759"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="1064"/>
+        <location filename="../planner.c" line="769"/>
+        <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="1085"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1099"/>
+        <location filename="../profile.c" line="1113"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -5980,28 +6232,28 @@ D:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1102"/>
+        <location filename="../profile.c" line="1116"/>
         <source>P: %d%s
 </source>
         <translation>P:%d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1106"/>
+        <location filename="../profile.c" line="1120"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1112"/>
+        <location filename="../profile.c" line="1126"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1115"/>
+        <location filename="../profile.c" line="1129"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>CAS: %.*f%s/min
@@ -6009,42 +6261,42 @@ D:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1117"/>
+        <location filename="../profile.c" line="1131"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1119"/>
+        <location filename="../profile.c" line="1133"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO₂%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1121"/>
+        <location filename="../profile.c" line="1135"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN₂ %s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1123"/>
+        <location filename="../profile.c" line="1137"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1140"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1147"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -6053,7 +6305,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1137"/>
+        <location filename="../profile.c" line="1151"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -6062,148 +6314,148 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1149"/>
+        <location filename="../profile.c" line="1163"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Sosta di sicurezza: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1152"/>
+        <location filename="../profile.c" line="1166"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Sosta di sicurezza: </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1157"/>
+        <location filename="../profile.c" line="1171"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1174"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: temo di sosta sconosciuto @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1178"/>
         <source>In deco
 </source>
         <translation>In deco
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1166"/>
+        <location filename="../profile.c" line="1180"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1183"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1172"/>
+        <location filename="../profile.c" line="1186"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1180"/>
+        <location filename="../profile.c" line="1194"/>
         <source>In deco (calc)
 </source>
         <translation>In deco (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1196"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL:%umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1185"/>
+        <location filename="../profile.c" line="1199"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1188"/>
+        <location filename="../profile.c" line="1202"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Ceiling calcolato %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1194"/>
+        <location filename="../profile.c" line="1208"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Tessuto %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1214"/>
         <source>heartbeat: %d
 </source>
         <translation>Battito cardiaco: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1202"/>
+        <location filename="../profile.c" line="1216"/>
         <source>bearing: %d
 </source>
         <translation>Direzione: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1205"/>
+        <location filename="../profile.c" line="1219"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>Profondità media fin qui %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1314"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1304"/>
-        <location filename="../profile.c" line="1308"/>
-        <location filename="../profile.c" line="1312"/>
+        <location filename="../profile.c" line="1318"/>
+        <location filename="../profile.c" line="1322"/>
+        <location filename="../profile.c" line="1326"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1316"/>
+        <location filename="../profile.c" line="1330"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1334"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1324"/>
-        <location filename="../profile.c" line="1328"/>
+        <location filename="../profile.c" line="1338"/>
+        <location filename="../profile.c" line="1342"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1335"/>
+        <location filename="../profile.c" line="1349"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -6334,6 +6586,7 @@ EADD: %d%s
     </message>
     <message>
         <location filename="../dive.c" line="30"/>
+        <location filename="../equipment.c" line="85"/>
         <source>oxygen</source>
         <translation>ossigeno</translation>
     </message>
@@ -6388,97 +6641,97 @@ EADD: %d%s
         <translation>(nessuna immersione)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Mon</source>
         <translation>Lun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Tue</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Wed</source>
         <translation>Mer</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Thu</source>
         <translation>Gio</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Fri</source>
         <translation>Ven</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sat</source>
         <translation>Sab</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jan</source>
         <translation>Gen</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>May</source>
         <translation>Mag</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jun</source>
         <translation>Giu</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Jul</source>
         <translation>Lug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Aug</source>
         <translation>Ago</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Sep</source>
         <translation>Set</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Oct</source>
         <translation>Ott</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Dec</source>
         <translation>Dic</translation>
     </message>
@@ -7082,13 +7335,13 @@ Lo Uemis Zurich e&apos; collegato correttamente?</translation>
         <translation>Pianificazione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
         <source>GF low</source>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>%</source>
         <translation>%</translation>
     </message>
@@ -7098,7 +7351,7 @@ Lo Uemis Zurich e&apos; collegato correttamente?</translation>
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="335"/>
         <source>Drop to first depth</source>
         <translation>Discesa immediata</translation>
     </message>
@@ -7108,69 +7361,69 @@ Lo Uemis Zurich e&apos; collegato correttamente?</translation>
         <translation>Ultima sosta a 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
         <source>Plan backgas breaks</source>
         <translation>Pianifica i break in backgas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="355"/>
         <source>Gas options</source>
         <translation>Impostazioni gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="376"/>
         <source>Bottom SAC</source>
         <translation>CAS sul fondo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="383"/>
         <source>Deco SAC</source>
         <translation>CAS in deco</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="380"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="390"/>
         <source>Bottom pO₂</source>
         <translation>pO₂ sul fondo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="403"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="413"/>
         <source>Deco pO₂</source>
         <translation>pO₂ in deco</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="449"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="462"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="478"/>
         <source>Dive notes</source>
         <translation>Note di immersione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
         <source>Display runtime</source>
         <translation>Mostra il runtime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <source>Display segment duration</source>
         <translation>Mostra la durata del segmento</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="531"/>
         <source>Display transitions in deco</source>
         <translation>Mostra i cambi tappa in deco</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="538"/>
         <source>Verbatim dive plan</source>
         <translation>Piano di immersione dettagliato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="387"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="410"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="397"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -7190,17 +7443,17 @@ Lo Uemis Zurich e&apos; collegato correttamente?</translation>
         <translation>6m alla superficie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="499"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>Nel piano di immersione, mostra il runtime (tempo assoluto) delle soste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="515"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>Nel piano di immersione, mostra la durata (tempo relativo) delle soste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>Nel piano di immersione, elenca i cambi tappa o trattali come impliciti</translation>
     </message>
diff --git a/translations/subsurface_lv_LV.ts b/translations/subsurface_lv_LV.ts
index 323f3d881..db0552a16 100644
--- a/translations/subsurface_lv_LV.ts
+++ b/translations/subsurface_lv_LV.ts
@@ -3,12 +3,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="539"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="522"/>
         <source>Person: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="540"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="523"/>
         <source>Searches for buddies and divemasters</source>
         <translation type="unfinished"/>
     </message>
@@ -16,40 +16,188 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="233"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="230"/>
         <source>No buddies</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>ColumnNameProvider</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>GPS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Avg depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="210"/>
+        <location filename="../configuredivecomputer.cpp" line="212"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="226"/>
+        <location filename="../configuredivecomputer.cpp" line="228"/>
         <source>Could not open backup file: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="542"/>
+        <location filename="../configuredivecomputer.cpp" line="552"/>
         <source>Dive computer details read successfully</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="551"/>
+        <location filename="../configuredivecomputer.cpp" line="561"/>
         <source>Setting successfully written to device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="560"/>
+        <location filename="../configuredivecomputer.cpp" line="570"/>
         <source>Device firmware successfully updated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="569"/>
+        <location filename="../configuredivecomputer.cpp" line="579"/>
         <source>Device settings successfully reset</source>
         <translation type="unfinished"/>
     </message>
@@ -847,70 +995,70 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1053"/>
         <source>Backup files (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1037"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1040"/>
         <source>Backup succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1041"/>
         <source>Your settings have been saved to: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1030"/>
         <source>Backup dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1036"/>
         <source>XML backup error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1052"/>
         <source>Restore dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1056"/>
         <source>XML restore error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1057"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1063"/>
         <source>Restore succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1064"/>
         <source>Your settings have been restored successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1074"/>
         <source>Select firmware file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1075"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -968,12 +1116,12 @@
         <translation>Noklikšķot šeit Jūs noņemsiet balonu.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="410"/>
         <source>Cylinder cannot be removed</source>
         <translation>Balons never būt noņemts.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="407"/>
+        <location filename="../qt-ui/models.cpp" line="411"/>
         <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>
@@ -1049,12 +1197,12 @@
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="48"/>
         <source>Remove the selected dive computer?</source>
         <translation>Likvidēt izvēlētus datorus?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="49"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
         <translation>Vai Jūs esat pārliecināti ka gribat
@@ -1069,22 +1217,22 @@ likvidēt izvēlētus datorus?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Model</source>
         <translation>Modelis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Device ID</source>
         <translation>Ierīces ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Nickname</source>
         <translation>Lietotājvārds</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Noklikšķot šeit Jūs noņemsiet niršanas datoru.</translation>
     </message>
@@ -1092,117 +1240,145 @@ likvidēt izvēlētus datorus?</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="115"/>
         <source>Bailing out to OC</source>
         <translation>Pāreja uz OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="117"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>Kļūda: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>beigas</translation>
     </message>
 </context>
 <context>
+    <name>DiveImportedModel</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="556"/>
+        <source>Date/time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
+        <source>Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>h:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>min</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1242"/>
+        <location filename="../qt-ui/models.cpp" line="1248"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1245"/>
+        <location filename="../qt-ui/models.cpp" line="1251"/>
         <source>Date</source>
         <translation>Datums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1248"/>
+        <location filename="../qt-ui/models.cpp" line="1254"/>
         <source>Rating</source>
         <translation>Novērtējums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1254"/>
+        <location filename="../qt-ui/models.cpp" line="1260"/>
         <source>Duration</source>
         <translation>Ilgums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1263"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>lbs</source>
         <translation>mārciņa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1263"/>
+        <location filename="../qt-ui/models.cpp" line="1269"/>
         <source>Suit</source>
         <translation>Kostīms</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1266"/>
+        <location filename="../qt-ui/models.cpp" line="1272"/>
         <source>Cyl</source>
         <translation>Balons</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1269"/>
+        <location filename="../qt-ui/models.cpp" line="1275"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1277"/>
+        <location filename="../qt-ui/models.cpp" line="1283"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1280"/>
+        <location filename="../qt-ui/models.cpp" line="1286"/>
         <source>Max CNS</source>
         <translation>Maks. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1283"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>Location</source>
         <translation>Vieta</translation>
     </message>
@@ -1210,87 +1386,87 @@ likvidēt izvēlētus datorus?</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="787"/>
+        <location filename="../qt-ui/divelistview.cpp" line="768"/>
         <source>Expand all</source>
         <translation>Izvērst visu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="788"/>
+        <location filename="../qt-ui/divelistview.cpp" line="769"/>
         <source>Collapse all</source>
         <translation>Savērst visu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="789"/>
+        <location filename="../qt-ui/divelistview.cpp" line="770"/>
         <source>Collapse others</source>
         <translation>Savērst pārējus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="791"/>
+        <location filename="../qt-ui/divelistview.cpp" line="772"/>
         <source>Remove dive(s) from trip</source>
         <translation>Noņemt niršanas reizi(-es) no ceļojuma</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="792"/>
+        <location filename="../qt-ui/divelistview.cpp" line="773"/>
         <source>Create new trip above</source>
         <translation>Izveidot jaunu ceļojumu augšup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="806"/>
+        <location filename="../qt-ui/divelistview.cpp" line="787"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Nekavējoties pievienot niršanu(-as) ceļojumam augšup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="808"/>
+        <location filename="../qt-ui/divelistview.cpp" line="789"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Tūlītēji pievienot niršanu(-as) pie apakšēja ceļojuma</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="812"/>
+        <location filename="../qt-ui/divelistview.cpp" line="793"/>
         <source>Merge trip with trip above</source>
         <translation>Saplūdināt ceļojumu ar augšējo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="813"/>
+        <location filename="../qt-ui/divelistview.cpp" line="794"/>
         <source>Merge trip with trip below</source>
         <translation>Saplūdināt ceļojumu ar apakšējo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="817"/>
+        <location filename="../qt-ui/divelistview.cpp" line="798"/>
         <source>Delete dive(s)</source>
         <translation>Izdzēst niršanu(-as)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="819"/>
+        <location filename="../qt-ui/divelistview.cpp" line="800"/>
         <source>Mark dive(s) invalid</source>
         <translation>Atzīmēt niršanu(-as) kā nepareizus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="823"/>
+        <location filename="../qt-ui/divelistview.cpp" line="804"/>
         <source>Merge selected dives</source>
         <translation>Saplūdināt izvēlētas niršanas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="825"/>
+        <location filename="../qt-ui/divelistview.cpp" line="806"/>
         <source>Renumber dive(s)</source>
         <translation>Pārnumurēt niršanu(-as)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="826"/>
+        <location filename="../qt-ui/divelistview.cpp" line="807"/>
         <source>Shift times</source>
         <translation>Nobīdīt laikus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="827"/>
+        <location filename="../qt-ui/divelistview.cpp" line="808"/>
         <source>Load images</source>
         <translation>Ielādēt attēlus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Open image files</source>
         <translation>Atvērt attēla failu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Attēlu faili (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -1475,100 +1651,100 @@ likvidēt izvēlētus datorus?</translation>
         <translation>Smilts</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF faili (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="268"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>CSV faili (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="68"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
         <source>Subsurface native XML format.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
         <source>Write depths of images to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export UDDF file as</source>
         <translation>Eksportēt UDDF failu kā</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="267"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
         <source>Export CSV file as</source>
         <translation>Eksportēt CSV failu kā</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="278"/>
         <source>Export world map</source>
         <translation>Eksportēt pasaules karti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="299"/>
         <source>HTML files (*.html)</source>
         <translation>HTML faili (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="283"/>
         <source>Export Subsurface XML</source>
         <translation>Eksportēt Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="284"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML faili (*.xml, *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
         <source>Save image depths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="298"/>
         <source>Export HTML files as</source>
         <translation>Eksportēt HTML failus, kā</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
         <source>Can&apos;t open file %s</source>
         <translation>Nevar atvērt failu %s</translation>
     </message>
@@ -1581,248 +1757,228 @@ likvidēt izvēlētus datorus?</translation>
         <translation>Niršanas žurnālu importēšana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
-        <source>CSV options</source>
-        <translation>CSV opcijas</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="281"/>
-        <source>Pre-configured imports</source>
-        <translation>Importa veidnes</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="122"/>
-        <source>Depth</source>
-        <translation>Dziļums</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="142"/>
-        <source>Stopdepth</source>
-        <translation>Pieturas dziļums</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="162"/>
-        <source>Pressure</source>
-        <translation>Spiediens</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="176"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="466"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
         <source>Time</source>
         <translation>Laiks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="183"/>
-        <source>Temp</source>
-        <translation>Temp.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="213"/>
-        <source>NDL</source>
-        <translation>NDL</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="233"/>
-        <source>TTS</source>
-        <translation>TTS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="253"/>
-        <source>Cns</source>
-        <translation>CNS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="58"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="789"/>
-        <source>Field separator</source>
-        <translation>Lauka atdalītājs</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="35"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="363"/>
-        <source>Units</source>
-        <translation>Vienības</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="42"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="370"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="97"/>
         <source>Metric</source>
         <translation>Metrisks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="47"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="375"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="102"/>
         <source>Imperial</source>
         <translation>Imperiāls</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="169"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="298"/>
-        <source>Manual dives</source>
-        <translation>Roku niršanas</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="316"/>
-        <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="319"/>
-        <source>Date format</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="332"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="59"/>
         <source>dd.mm.yyyy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="337"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="64"/>
         <source>mm/dd/yyyy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="342"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="69"/>
         <source>yyyy-mm-dd</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="392"/>
-        <source>Dive #</source>
-        <translation>Niršana #</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="426"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="439"/>
-        <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+        <source>Dive #</source>
+        <translation>Niršana #</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="429"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
         <source>Date</source>
         <translation>Datums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="500"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="513"/>
-        <source>Dive duration in seconds or in min:sec format</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="503"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
         <source>Duration</source>
         <translation>Ilgums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="574"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
         <source>GPS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="591"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
         <source>Tags</source>
         <translation>Tagi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="608"/>
-        <source>Cyl size</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+        <source>He</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="625"/>
-        <source>Air temp</source>
-        <translation>Gaisa temp.</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="78"/>
+        <source>Seconds</source>
+        <translation>Sekundes</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
+        <source>Minutes</source>
+        <translation>Minūtes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="642"/>
-        <source>Start Pressure</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="88"/>
+        <source>Minutes:seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="659"/>
-        <source>Water temp</source>
-        <translation>Ūdens temp.</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+        <source>Location</source>
+        <translation>Vieta</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+        <source>Max depth</source>
+        <translation>Maks. dziļums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="676"/>
-        <source>End Press</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+        <source>Tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="693"/>
-        <source>O₂</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="710"/>
-        <source>He</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+        <source>Sample time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="742"/>
-        <source>Choose duration format.</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+        <source>Sample depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="745"/>
-        <source>Duration format</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+        <source>Sample temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="758"/>
-        <source>Seconds</source>
-        <translation>Sekundes</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="763"/>
-        <source>Minutes</source>
-        <translation>Minūtes</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="768"/>
-        <source>Minutes:seconds</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+        <source>Sample ndl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="540"/>
-        <source>Location</source>
-        <translation>Vieta</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="409"/>
-        <source>Max depth</source>
-        <translation>Maks. dziļums</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="386"/>
-        <source>Field configuration</source>
-        <translation>Lauka konfigurēšana</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+        <source>Samples pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
         <source>Mean depth</source>
         <translation>Vid. dziļums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="483"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
         <source>Buddy</source>
         <translation>Draugs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="523"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
         <source>Notes</source>
         <translation>Piezīmes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="557"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
         <source>Weight</source>
         <translation>Svars</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DivePlanner</name>
@@ -1865,42 +2021,42 @@ likvidēt izvēlētus datorus?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
         <source>unknown</source>
         <translation>nezināms</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="691"/>
         <source>Final depth</source>
         <translation>Gala dziļums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="693"/>
         <source>Run time</source>
         <translation>Izpildes laiks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="701"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="695"/>
         <source>Duration</source>
         <translation>Ilgums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="703"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
         <source>Used gas</source>
         <translation>Izm. gāze</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="705"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
         <source>CC set point</source>
         <translation>CC regulēšana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1044"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1051"/>
         <source>Discard the plan?</source>
         <translation>Atcelt plānu?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1045"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1052"/>
         <source>You are about to discard your plan.</source>
         <translation>Jūs taisāties atcelt plānu.</translation>
     </message>
@@ -1908,22 +2064,22 @@ likvidēt izvēlētus datorus?</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="257"/>
         <source>Dive planner points</source>
         <translation>Niršanas vietas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="261"/>
         <source>Available gases</source>
         <translation>Pieejamas gāzes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="284"/>
         <source>Add dive data point</source>
         <translation>Pievienot niršanas vietu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="304"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="293"/>
         <source>Save new</source>
         <translation type="unfinished"/>
     </message>
@@ -1931,92 +2087,112 @@ likvidēt izvēlētus datorus?</translation>
 <context>
     <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Depth</source>
         <translation>Dziļums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
         <source>Time</source>
         <translation>Laiks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
         <source>Pressure</source>
         <translation>Spiediens</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>Temperature</source>
         <translation>Temperatūra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
         <source>Color</source>
         <translation>Krāsa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
         <source>Pressure S</source>
         <translation>Spiedums S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
+        <source>Setpoint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
+        <source>Sensor1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
+        <source>Sensor2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
+        <source>Sensor3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
         <source>Ambient pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
-        <source>Heart Beat</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
+        <source>Heart beat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
-        <source>Gradient Factor</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/>
+        <source>Gradient factor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
-        <source>Mean Depth/s</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
+        <source>Mean depth/s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
         <source>Pressure I</source>
         <translation>Spiediens I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
         <source>User entered</source>
         <translation>Ievādīts lietotājs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
         <source>Cylinder index</source>
         <translation>Balona indekss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
         <source>Ceiling</source>
         <translation>Maksimāla dekompr. pietura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
@@ -2067,127 +2243,127 @@ likvidēt izvēlētus datorus?</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1437"/>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1443"/>
+        <location filename="../qt-ui/models.cpp" line="1489"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1440"/>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1492"/>
         <source>Date</source>
         <translation>Datums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1443"/>
-        <location filename="../qt-ui/models.cpp" line="1489"/>
+        <location filename="../qt-ui/models.cpp" line="1449"/>
+        <location filename="../qt-ui/models.cpp" line="1495"/>
         <source>Rating</source>
         <translation>Novērtējums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1452"/>
         <source>Depth</source>
         <translation>Dziļums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1458"/>
         <source>Temp</source>
         <translation>Temp.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1461"/>
         <source>Weight</source>
         <translation>Svars</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1458"/>
-        <location filename="../qt-ui/models.cpp" line="1504"/>
+        <location filename="../qt-ui/models.cpp" line="1464"/>
+        <location filename="../qt-ui/models.cpp" line="1510"/>
         <source>Suit</source>
         <translation>Kostīms</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1461"/>
-        <location filename="../qt-ui/models.cpp" line="1507"/>
+        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1513"/>
         <source>Cyl</source>
         <translation>Balons</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1464"/>
-        <location filename="../qt-ui/models.cpp" line="1510"/>
+        <location filename="../qt-ui/models.cpp" line="1470"/>
+        <location filename="../qt-ui/models.cpp" line="1516"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1473"/>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1527"/>
         <source>Max CNS</source>
         <translation>Maks. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
-        <location filename="../qt-ui/models.cpp" line="1524"/>
+        <location filename="../qt-ui/models.cpp" line="1482"/>
+        <location filename="../qt-ui/models.cpp" line="1530"/>
         <source>Location</source>
         <translation>Vieta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1449"/>
-        <location filename="../qt-ui/models.cpp" line="1495"/>
+        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1501"/>
         <source>Duration</source>
         <translation>Ilgums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1498"/>
+        <location filename="../qt-ui/models.cpp" line="1504"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>lbs</source>
         <translation>mārciņa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1470"/>
-        <location filename="../qt-ui/models.cpp" line="1518"/>
+        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1524"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -2195,95 +2371,95 @@ likvidēt izvēlētus datorus?</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="98"/>
         <source>no dives were selected</source>
         <translation>neviena niršana nebija izvēlēta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="117"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>neizdevas izveidot ZIP failu augšupielādēšanai: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="143"/>
         <source>cannot create temporary file: %s</source>
         <translation>nevar izveidot pagaidu failu: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/>
         <source>internal error: %s</source>
         <translation>iekšēja kļūda: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="169"/>
         <source>internal error</source>
         <translation>iekšēja kļūda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="629"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="828"/>
         <source>Done</source>
         <translation>Izdarīts</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/>
         <source>Uploading dive list...</source>
         <translation>Augšupielādē niršanas sarakstu...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="692"/>
         <source>Downloading dive list...</source>
         <translation>Niršanas saraksta lejupielādēšana...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="741"/>
         <source>Downloading %1 dives...</source>
         <translation>Lejupielādē %1 niršanas...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="785"/>
         <source>Download finished - %1</source>
         <translation>Lejupielādēšana pabeigta - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="802"/>
         <source>Corrupted download</source>
         <translation>Bojāta lejupielādēšana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Nevar atvērt arhīvu:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
         <source>Upload failed</source>
         <translation>Augšupielādēšana neizdodas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/>
         <source>Upload successful</source>
         <translation>Sekmīga augšupielādēšana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
         <source>Login failed</source>
         <translation>Pieteikšanās neizdevās</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
         <source>Cannot parse response</source>
         <translation>Nevar noparsēt atbildi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
         <source>Error: %1</source>
         <translation>Kļūda: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="829"/>
         <source>Upload finished</source>
         <translation>Augšupielādēšana ir pabeigta</translation>
     </message>
@@ -2291,54 +2467,52 @@ likvidēt izvēlētus datorus?</translation>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="169"/>
         <source>Error</source>
         <translation>Kļūda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="400"/>
         <source>Retry</source>
         <translation>Atkārtot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="264"/>
         <source>Find Uemis dive computer</source>
         <translation>Atrast Uemis niršanas datoru</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Izvēliet failu priekš žurnāla lejupielādēšanas no niršanas datora</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Log files (*.log)</source>
         <translation>Žurnalēšanas faili (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="362"/>
         <source>Warning</source>
         <translation>Brīdinājums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="363"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>Saglabājot izraksti, niršanas NEsaglabājas niršanas sarakstā.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="374"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Izvēliet failu priekš niršanas datora bināra izraksta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="375"/>
         <source>Dump files (*.bin)</source>
         <translation>Izraksta faili (*.bin)</translation>
     </message>
@@ -2346,7 +2520,7 @@ likvidēt izvēlētus datorus?</translation>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="101"/>
         <source>Vendor</source>
         <translation>Ražotājs</translation>
     </message>
@@ -2356,54 +2530,74 @@ likvidēt izvēlētus datorus?</translation>
         <translation>Lejupielādēt no niršanas datora</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="31"/>
         <source>Device or mount point</source>
         <translation>Ierīce via montēšanas vieta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="111"/>
         <source>Dive computer</source>
         <translation>Niršanas dators</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="132"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="45"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="80"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="94"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="52"/>
         <source>Force download of all dives</source>
         <translation>Piespiest lejupielādēt visas niršanas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
         <source>Always prefer downloaded dives</source>
         <translation>Vienmēr lejupielādēt niršanas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
         <source>OK</source>
         <translation>Labi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="189"/>
         <source>Cancel</source>
         <translation>Atcelt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/>
+        <source>Downloaded Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
+        <source>Select all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
+        <source>Unselect all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
         <source>Save libdivecomputer logfile</source>
         <translation>Saglabāt libdivecomputer žurnālu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="87"/>
         <source>Save libdivecomputer dumpfile</source>
         <translation>Saglabāt libdivecomputer izraksta failu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
         <source>Download into new trip</source>
         <translation type="unfinished"/>
     </message>
@@ -2411,12 +2605,12 @@ likvidēt izvēlētus datorus?</translation>
 <context>
     <name>ExtraDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Value</source>
         <translation type="unfinished"/>
     </message>
@@ -2430,21 +2624,21 @@ likvidēt izvēlētus datorus?</translation>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="245"/>
-        <source>Your dive profile was updated to facebook.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
-        <source>Photo Upload Failed</source>
+        <source>Your dive profile was updated to Facebook.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="250"/>
-        <source>Your dive profile was not updated to facebook, 
+        <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+        <source>Photo Upload Failed</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>FilterWidget</name>
@@ -2485,17 +2679,17 @@ likvidēt izvēlētus datorus?</translation>
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1544"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1621"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1624"/>
         <source>Firmware update failed!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1550"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1627"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -2503,7 +2697,7 @@ likvidēt izvēlētus datorus?</translation>
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="128"/>
+        <location filename="../qt-ui/globe.cpp" line="119"/>
         <source>Edit selected dive locations</source>
         <translation>Rediģēt izvēlētas niršanas vietas</translation>
     </message>
@@ -2511,7 +2705,7 @@ likvidēt izvēlētus datorus?</translation>
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="566"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="549"/>
         <source>Location: </source>
         <translation type="unfinished"/>
     </message>
@@ -2519,7 +2713,7 @@ likvidēt izvēlētus datorus?</translation>
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="286"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="283"/>
         <source>No location set</source>
         <translation type="unfinished"/>
     </message>
@@ -2527,347 +2721,352 @@ likvidēt izvēlētus datorus?</translation>
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="133"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
+        <location filename="../qt-ui/maintab.cpp" line="497"/>
         <source>Location</source>
         <translation>Vieta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="67"/>
         <source>Coordinates</source>
         <translation>Koordinātas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="169"/>
         <source>Divemaster</source>
         <translation>Niršanas speciālists</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="154"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Buddy</source>
         <translation>Draugs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="222"/>
+        <location filename="../qt-ui/maintab.ui" line="277"/>
         <source>Tags</source>
         <translation>Tagi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="186"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
         <source>Rating</source>
         <translation>Novērtējums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="221"/>
         <source>Visibility</source>
         <translation>Redzamība</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="230"/>
         <source>Suit</source>
         <translation>Kostīms</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="465"/>
+        <location filename="../qt-ui/maintab.cpp" line="470"/>
         <source>Dive notes</source>
         <translation>Niršanas piezīmes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
-        <location filename="../qt-ui/maintab.ui" line="648"/>
-        <location filename="../qt-ui/maintab.cpp" line="277"/>
+        <location filename="../qt-ui/maintab.ui" line="74"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="102"/>
+        <location filename="../qt-ui/maintab.ui" line="677"/>
+        <location filename="../qt-ui/maintab.cpp" line="279"/>
         <source>Air temp.</source>
         <translation>Gaisa temp.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <location filename="../qt-ui/maintab.ui" line="667"/>
-        <location filename="../qt-ui/maintab.cpp" line="278"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.ui" line="696"/>
+        <location filename="../qt-ui/maintab.cpp" line="280"/>
         <source>Water temp.</source>
         <translation>Ūdens temp.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="229"/>
-        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.ui" line="284"/>
+        <location filename="../qt-ui/maintab.cpp" line="498"/>
         <source>Notes</source>
         <translation>Piezīmes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="369"/>
+        <location filename="../qt-ui/maintab.ui" line="398"/>
         <source>Equipment</source>
         <translation>Aprīkojums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="496"/>
+        <location filename="../qt-ui/maintab.ui" line="525"/>
         <source>Gases used</source>
         <translation>Izmant. gāzes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="515"/>
+        <location filename="../qt-ui/maintab.ui" line="544"/>
         <source>Gas consumed</source>
         <translation>Patērēta gāze</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="553"/>
+        <location filename="../qt-ui/maintab.ui" line="582"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="591"/>
+        <location filename="../qt-ui/maintab.ui" line="620"/>
         <source>Max. depth</source>
         <translation>Maks. dziļums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="629"/>
+        <location filename="../qt-ui/maintab.ui" line="658"/>
         <source>Air pressure</source>
         <translation>Gaisa spiediens</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="686"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>Dive time</source>
         <translation>Niršanas laiks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="845"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
         <source>Total time</source>
         <translation>Kopējais laiks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="903"/>
+        <location filename="../qt-ui/maintab.ui" line="932"/>
         <source>Gas consumption</source>
         <translation>Gāzes patērēšana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="962"/>
+        <location filename="../qt-ui/maintab.ui" line="991"/>
         <source>Extra data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="968"/>
+        <location filename="../qt-ui/maintab.ui" line="997"/>
         <source>Additional data from dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="54"/>
-        <location filename="../qt-ui/maintab.ui" line="458"/>
+        <location filename="../qt-ui/maintab.ui" line="83"/>
+        <location filename="../qt-ui/maintab.ui" line="487"/>
         <source>Date</source>
         <translation>Datums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="61"/>
+        <location filename="../qt-ui/maintab.ui" line="90"/>
         <source>Time</source>
         <translation>Laiks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="425"/>
+        <location filename="../qt-ui/maintab.ui" line="454"/>
         <source>Dive info</source>
         <translation>Niršanas informācija</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="477"/>
+        <location filename="../qt-ui/maintab.ui" line="506"/>
         <source>Interval</source>
         <translation>Intervāls</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="534"/>
-        <location filename="../qt-ui/maintab.ui" line="799"/>
+        <location filename="../qt-ui/maintab.ui" line="563"/>
+        <location filename="../qt-ui/maintab.ui" line="828"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="610"/>
+        <location filename="../qt-ui/maintab.ui" line="639"/>
         <source>Avg. depth</source>
         <translation>Vid. dziļums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="572"/>
+        <location filename="../qt-ui/maintab.ui" line="601"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="734"/>
         <source>Salinity</source>
         <translation>Sāļums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="742"/>
+        <location filename="../qt-ui/maintab.ui" line="771"/>
         <source>Stats</source>
         <translation>Statistika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="775"/>
+        <location filename="../qt-ui/maintab.ui" line="804"/>
         <source>Depth</source>
         <translation>Dziļums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="787"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Temperature</source>
         <translation>Temperatūra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="813"/>
+        <location filename="../qt-ui/maintab.ui" line="842"/>
         <source>Duration</source>
         <translation>Ilgums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="864"/>
+        <location filename="../qt-ui/maintab.ui" line="893"/>
         <source>Dives</source>
         <translation>Niršanas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="948"/>
+        <location filename="../qt-ui/maintab.ui" line="977"/>
         <source>Photos</source>
         <translation>Fotogrāfijas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="95"/>
+        <location filename="../qt-ui/maintab.cpp" line="87"/>
         <source>Cylinders</source>
         <translation>Cilindri</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="99"/>
+        <location filename="../qt-ui/maintab.cpp" line="91"/>
         <source>Weights</source>
         <translation>Sver</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="55"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Apply changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="59"/>
+        <location filename="../qt-ui/maintab.cpp" line="50"/>
         <source>Discard changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="96"/>
+        <location filename="../qt-ui/maintab.cpp" line="88"/>
         <source>Add cylinder</source>
         <translation>Pievienot cilindri</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="100"/>
+        <location filename="../qt-ui/maintab.cpp" line="92"/>
         <source>Add weight system</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="274"/>
+        <location filename="../qt-ui/maintab.cpp" line="276"/>
         <source>Air temp. [%1]</source>
         <translation>Gaisa temp. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="275"/>
+        <location filename="../qt-ui/maintab.cpp" line="277"/>
         <source>Water temp. [%1]</source>
         <translation>Ūdens temp. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="312"/>
+        <location filename="../qt-ui/maintab.cpp" line="314"/>
         <source>This trip is being edited.</source>
         <translation>Ceļojuma rediģēšana.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="320"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Multiple dives are being edited.</source>
         <translation>Daudzkārtīga ceļojumu rediģēšana.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.cpp" line="324"/>
         <source>This dive is being edited.</source>
         <translation>Niršanas rediģēšana.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="436"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
+        <location filename="../qt-ui/maintab.cpp" line="465"/>
         <source>Trip notes</source>
         <translation>Ceļojuma piezīmes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="458"/>
+        <location filename="../qt-ui/maintab.cpp" line="463"/>
         <source>Trip location</source>
         <translation>Ceļojuma vieta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="526"/>
-        <location filename="../qt-ui/maintab.cpp" line="558"/>
-        <location filename="../qt-ui/maintab.cpp" line="562"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
         <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="574"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="555"/>
+        <location filename="../qt-ui/maintab.cpp" line="563"/>
         <source>Deepest dive</source>
         <translation>Visdziļākā niršana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="556"/>
+        <location filename="../qt-ui/maintab.cpp" line="564"/>
         <source>Shallowest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="569"/>
+        <location filename="../qt-ui/maintab.cpp" line="577"/>
         <source>Highest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="578"/>
         <source>Lowest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="571"/>
+        <location filename="../qt-ui/maintab.cpp" line="579"/>
         <source>Average total SAC of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="582"/>
+        <location filename="../qt-ui/maintab.cpp" line="590"/>
         <source>Highest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="583"/>
+        <location filename="../qt-ui/maintab.cpp" line="591"/>
         <source>Lowest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="584"/>
+        <location filename="../qt-ui/maintab.cpp" line="592"/>
         <source>Average temperature of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="594"/>
+        <location filename="../qt-ui/maintab.cpp" line="602"/>
         <source>Longest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="595"/>
+        <location filename="../qt-ui/maintab.cpp" line="603"/>
         <source>Shortest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="596"/>
+        <location filename="../qt-ui/maintab.cpp" line="604"/>
         <source>Average length of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="620"/>
+        <location filename="../qt-ui/maintab.cpp" line="628"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="624"/>
+        <location filename="../qt-ui/maintab.cpp" line="632"/>
         <source> and </source>
         <translation>un</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="911"/>
+        <location filename="../qt-ui/maintab.cpp" line="925"/>
         <source>Discard the changes?</source>
         <translation>Atcelt izmaiņas?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="912"/>
+        <location filename="../qt-ui/maintab.cpp" line="926"/>
         <source>You are about to discard your changes.</source>
         <translation>Jūs taisāties atcelt izmaiņas.</translation>
     </message>
@@ -3014,7 +3213,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="296"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="232"/>
         <source>Open</source>
         <translation>Atvērt</translation>
     </message>
@@ -3374,90 +3573,90 @@ p, li { white-space: pre-wrap; }
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="252"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="229"/>
         <source>Open file</source>
         <translation>Atvērt failu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="256"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="233"/>
         <source>Cancel</source>
         <translation>Atcelt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="332"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="309"/>
         <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="444"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
         <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="491"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
         <source>Print runtime table</source>
         <translation>Izdrukāt niršanas tabulu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="834"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="811"/>
         <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="836"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="813"/>
         <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="841"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="818"/>
         <source>Save changes?</source>
         <translation>Saglabāt izmaiņas?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1196"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1173"/>
         <source>Save file as</source>
         <translation>Saglabāt kā</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1337"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1314"/>
         <source>Open dive log file</source>
         <translation>Atvērt niršanas žurnālu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="819"/>
         <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="300"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="444"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="277"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Warning</source>
         <translation>Brīdinājums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1180"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1157"/>
         <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="625"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="602"/>
         <source>Yearly statistics</source>
         <translation>Gada statistika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1197"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1174"/>
         <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="1338"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1315"/>
         <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <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>
@@ -3465,7 +3664,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="651"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="634"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation type="unfinished"/>
     </message>
@@ -3473,39 +3672,39 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="239"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="243"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="244"/>
         <source>Not now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="245"/>
         <source>Update firmware</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
         <source>Firmware upgrade notice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
         <source>Save the downloaded firmware as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
         <source>HEX files (*.hex)</source>
         <translation type="unfinished"/>
     </message>
@@ -3513,54 +3712,69 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Open circuit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="481"/>
         <source>Last stop at 20ft</source>
         <translation>Pēdējā pietura pie 20ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="482"/>
         <source>50% avg. depth to 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="489"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
         <source>20ft to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="485"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
         <source>Last stop at 6m</source>
         <translation>Pēdējā pietura pie 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
         <source>50% avg. depth to 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="494"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
         <source>6m to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="497"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="498"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
         <source>cuft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="506"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="507"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="500"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="501"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
@@ -3679,6 +3893,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="816"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -3713,57 +3928,87 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="795"/>
+        <source>CCR: Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="809"/>
+        <source>Default CCR set-point for dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="832"/>
+        <source>pSCR O₂ metabolism rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="839"/>
+        <source>pSCR ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="846"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="859"/>
+        <source>1:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="875"/>
         <source>System default</source>
         <translation>Sistēmas noklusējama iestādīšana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="843"/>
+        <location filename="../qt-ui/preferences.ui" line="914"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="849"/>
+        <location filename="../qt-ui/preferences.ui" line="920"/>
         <source>Proxy type</source>
         <translation>Proxy veids</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="862"/>
+        <location filename="../qt-ui/preferences.ui" line="933"/>
         <source>Host</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="888"/>
+        <location filename="../qt-ui/preferences.ui" line="959"/>
         <source>Port</source>
         <translation>Ports</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="914"/>
+        <location filename="../qt-ui/preferences.ui" line="985"/>
         <source>Requires authentication</source>
         <translation>Vajadzīga autorizācija</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="934"/>
+        <location filename="../qt-ui/preferences.ui" line="1005"/>
         <source>Username</source>
         <translation>Lietotājvārds</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="957"/>
+        <location filename="../qt-ui/preferences.ui" line="1028"/>
         <source>Password</source>
         <translation>Parole</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="985"/>
-        <source>about:blank</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="1011"/>
-        <source>Disconnect from facebook</source>
+        <location filename="../qt-ui/preferences.ui" line="1079"/>
+        <source>Disconnect from Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="824"/>
+        <location filename="../qt-ui/preferences.ui" line="895"/>
         <source>Filter</source>
         <translation>Filtrs</translation>
     </message>
@@ -3918,52 +4163,52 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="28"/>
+        <location filename="../qt-ui/preferences.cpp" line="44"/>
         <source>No proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="29"/>
+        <location filename="../qt-ui/preferences.cpp" line="45"/>
         <source>System proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="30"/>
+        <location filename="../qt-ui/preferences.cpp" line="46"/>
         <source>HTTP proxy</source>
         <translation>HTTP proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="31"/>
+        <location filename="../qt-ui/preferences.cpp" line="47"/>
         <source>SOCKS proxy</source>
         <translation>SOCKS proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="291"/>
+        <location filename="../qt-ui/preferences.cpp" line="324"/>
         <source>Restart required</source>
         <translation>Ir nepieciešams restarts</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="292"/>
+        <location filename="../qt-ui/preferences.cpp" line="325"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>Lai pareizi atspoguļotu jaunu valodu Jums jārestartē Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="456"/>
+        <location filename="../qt-ui/preferences.cpp" line="494"/>
         <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML datnes (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Open default log file</source>
         <translation>Atvērt noklusējamo žurnalēšanas datni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="455"/>
+        <location filename="../qt-ui/preferences.cpp" line="493"/>
         <source>Warning</source>
         <translation>Brīdinājums</translation>
     </message>
@@ -3971,17 +4216,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="91"/>
+        <location filename="../qt-ui/printdialog.cpp" line="85"/>
         <source>&amp;Preview</source>
         <translation>&amp;Priekšskatījums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="88"/>
+        <location filename="../qt-ui/printdialog.cpp" line="82"/>
         <source>P&amp;rint</source>
         <translation>Drukāt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="103"/>
+        <location filename="../qt-ui/printdialog.cpp" line="97"/>
         <source>Print</source>
         <translation>Drukāt</translation>
     </message>
@@ -3989,42 +4234,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="20"/>
         <source>Dive#</source>
         <translation>Niršana#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="21"/>
         <source>Date</source>
         <translation>Datums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="22"/>
         <source>Depth</source>
         <translation>Dziļums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="23"/>
         <source>Duration</source>
         <translation>Ilgums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Master</source>
         <translation>Speciālists</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Buddy</source>
         <translation>Draugs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="34"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Location</source>
         <translation>Vieta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <location filename="../qt-ui/printlayout.cpp" line="63"/>
         <source>Subsurface cannot find a usable printer on this system!</source>
         <translation type="unfinished"/>
     </message>
@@ -4090,72 +4335,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2095"/>
+        <location filename="../qt-ui/models.cpp" line="2101"/>
         <source>unknown</source>
         <translation>nezināms</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2100"/>
+        <location filename="../qt-ui/models.cpp" line="2106"/>
         <source>Dive #%1 - %2</source>
         <translation>Niršana #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2103"/>
+        <location filename="../qt-ui/models.cpp" line="2109"/>
         <source>Max depth: %1 %2</source>
         <translation>Maks. dziļums: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2110"/>
+        <location filename="../qt-ui/models.cpp" line="2116"/>
         <source>Duration: %1 min</source>
         <translation>Ilgums: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2115"/>
+        <location filename="../qt-ui/models.cpp" line="2121"/>
         <source>Gas used:</source>
         <translation>Izm. gāze:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2117"/>
+        <location filename="../qt-ui/models.cpp" line="2123"/>
         <source>Tags:</source>
         <translation>Tagi:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2119"/>
+        <location filename="../qt-ui/models.cpp" line="2125"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2121"/>
+        <location filename="../qt-ui/models.cpp" line="2127"/>
         <source>Weights:</source>
         <translation>Krava:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2126"/>
+        <location filename="../qt-ui/models.cpp" line="2132"/>
         <source>Notes:</source>
         <translation>Piezīmes:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2133"/>
+        <location filename="../qt-ui/models.cpp" line="2139"/>
         <source>Divemaster:</source>
         <translation>Niršanas speciālists:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2135"/>
+        <location filename="../qt-ui/models.cpp" line="2141"/>
         <source>Buddy:</source>
         <translation>Draugs:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2137"/>
+        <location filename="../qt-ui/models.cpp" line="2143"/>
         <source>Suit:</source>
         <translation>Kostīms:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2139"/>
+        <location filename="../qt-ui/models.cpp" line="2145"/>
         <source>Viz:</source>
         <translation>Redz.:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2141"/>
+        <location filename="../qt-ui/models.cpp" line="2147"/>
         <source>Rating:</source>
         <translation>Novērtējums:</translation>
     </message>
@@ -4163,103 +4408,108 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="628"/>
         <source> (#%1 of %2)</source>
         <translation>(#%1 no %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="630"/>
+        <source>Unknown dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="647"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1168"/>
         <source>Make first divecomputer</source>
         <translation>Padarīt niršanas datoru par pirmo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Delete this divecomputer</source>
         <translation>Nodzēst šo niršanas datoru</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1184"/>
         <source>Add gas change</source>
         <translation>Pievienot gāzes maiņu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1187"/>
         <source> (Tank %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1195"/>
         <source>Add set-point change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1197"/>
         <source>Add bookmark</source>
         <translation>Pievienot grāmatzīmi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
         <source>Remove event</source>
         <translation>Noņemt notikumu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1206"/>
         <source>Hide similar events</source>
         <translation>Paslēpt līdzīgus notikumus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1213"/>
         <source>Edit name</source>
         <translation>Rediģēt vārdu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1242"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1249"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1264"/>
         <source>Unhide all events</source>
         <translation>Parādīt visus notikumus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide events</source>
         <translation>Paslēpt notikumus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide all %1 events?</source>
         <translation>Paslēpt visus %1 notikumus?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1333"/>
         <source>Remove the selected event?</source>
         <translation>Nodzēst izvēlēto notikumu?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1334"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1424"/>
         <source>Edit name of bookmark</source>
         <translation>Rediģēt grāmatzīmes vārdu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
         <source>Custom name:</source>
         <translation>Vārds:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1430"/>
         <source>Name is too long!</source>
         <translation type="unfinished"/>
     </message>
@@ -4267,102 +4517,102 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>AIR</source>
         <translation>Gaisa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>OXYGEN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="208"/>
         <source>Remove this point</source>
         <translation>Noņemt šo vietu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="57"/>
         <source>Close</source>
         <translation>Aizvērt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="42"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="25"/>
         <source>Average</source>
         <translation>Vidējais</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="45"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="28"/>
         <source>Minimum</source>
         <translation>Minimums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="48"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="31"/>
         <source>Maximum</source>
         <translation>Maksimums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="297"/>
+        <location filename="../qt-ui/globe.cpp" line="296"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>Pārvietojiet karti un klikšķiet divreiz, lai atzīmētu niršanas vietu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="525"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="526"/>
         <source>lbs</source>
         <translation>mārciņa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="550"/>
         <source>ft</source>
         <translation>pēda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="551"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="570"/>
+        <location filename="../qt-ui/models.cpp" line="574"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="571"/>
+        <location filename="../qt-ui/models.cpp" line="575"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="595"/>
+        <location filename="../qt-ui/models.cpp" line="599"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="596"/>
+        <location filename="../qt-ui/models.cpp" line="600"/>
         <source>cuft</source>
         <translation>kub. pēda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="513"/>
         <source>Invalid response from server</source>
         <translation>Nederīga servera atbilde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation>Gaidīja XML tagu &apos;DiveDateReader&apos;, bet saņēma &apos;%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="567"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation>Gaidīts XML tags &apos;DiveDates&apos; nav atrasts</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Kļūdaina XML atbilde. Līnija %1: %2</translation>
     </message>
@@ -4370,12 +4620,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1450"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1518"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1442"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -4389,12 +4639,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
-        <location filename="../qt-ui/simplewidgets.cpp" line="151"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="134"/>
         <source>New starting number</source>
         <translation>Jauns sākuma skaitlis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="149"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="132"/>
         <source>New number</source>
         <translation>Jauns numurs</translation>
     </message>
@@ -4402,12 +4652,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1575"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1653"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1579"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1657"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -4486,12 +4736,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Kurš datums un laiks ir attēlots?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="276"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="259"/>
         <source>Open image file</source>
         <translation>Atvērt attēla failu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="278"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="261"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Attēlu faili (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -4544,7 +4794,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <name>SocialNetworkDialog</name>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="282"/>
-        <source>Dive Date: %1 
+        <source>Dive date: %1 
 </source>
         <translation type="unfinished"/>
     </message>
@@ -4568,7 +4818,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="290"/>
-        <source>Dive Location: %1 
+        <source>Dive location: %1 
 </source>
         <translation type="unfinished"/>
     </message>
@@ -4685,47 +4935,47 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="329"/>
         <source>Webservice</source>
         <translation>Tīmekļserviss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="393"/>
         <source>Connecting...</source>
         <translation>Pieslēdzas...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
         <source>Download finished</source>
         <translation>Lajupielādēšana pabeigta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Download error: %1</source>
         <translation>Lejupielādēšanas kļūda: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="436"/>
         <source>Connection error: </source>
         <translation>Savienojuma kļūda:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
         <source>Download successful</source>
         <translation>Lejupielādēšana ir sekmīga</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="439"/>
         <source>Invalid user identifier!</source>
         <translation>Nepareizs lietotāja identifikators!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="312"/>
         <source>Enter User ID and click Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="442"/>
         <source>Cannot parse response!</source>
         <translation>Nevar saparsēt atbildi!</translation>
     </message>
@@ -4733,7 +4983,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="592"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="575"/>
         <source>Suits: </source>
         <translation type="unfinished"/>
     </message>
@@ -4741,7 +4991,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="119"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="116"/>
         <source>No suit set</source>
         <translation type="unfinished"/>
     </message>
@@ -4758,7 +5008,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="513"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="496"/>
         <source>Tags: </source>
         <translation type="unfinished"/>
     </message>
@@ -4766,7 +5016,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="144"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="141"/>
         <source>Empty tags</source>
         <translation type="unfinished"/>
     </message>
@@ -4774,17 +5024,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>Description</source>
         <translation>Apraksts</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -4792,7 +5042,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="141"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="131"/>
         <source>Information</source>
         <translation>Informācija</translation>
     </message>
@@ -4800,7 +5050,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1090"/>
+        <location filename="../qt-ui/models.cpp" line="1094"/>
         <source> (%1 shown)</source>
         <translation type="unfinished"/>
     </message>
@@ -4808,72 +5058,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="64"/>
         <source>Check for updates.</source>
         <translation>Pārbaudīt atjaunāšanas.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="66"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface&apos;am neizdevas pārbaudīt atjaunāšanas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="70"/>
         <source>The following error occurred:</source>
         <translation>Sekojoša kļūda gadījas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="72"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
         <source>Please check your internet connection.</source>
         <translation>Lūdzu, pārbaudiet interneta pieslēgšanu.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="85"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="84"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="88"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="95"/>
         <source>A new version of Subsurface is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="97"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
         <source>Latest version is %1, please check with your OS vendor for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="103"/>
         <source>Newest release version is </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="105"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
         <source>The server returned the following information:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="121"/>
         <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
         <source>Decline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="124"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
         <source>Accept</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="126"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="125"/>
         <source>Automatic check for updates</source>
         <translation type="unfinished"/>
     </message>
@@ -4881,13 +5131,13 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UserManual</name>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="55"/>
+        <location filename="../qt-ui/usermanual.cpp" line="54"/>
         <source>User Manual</source>
         <translation>Lietotāja rokasgrāmata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="72"/>
-        <location filename="../qt-ui/usermanual.cpp" line="78"/>
+        <location filename="../qt-ui/usermanual.cpp" line="71"/>
+        <location filename="../qt-ui/usermanual.cpp" line="77"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Nevar atrast Subsurface rokasgrāmatu</translation>
     </message>
@@ -4965,85 +5215,85 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
         <source>
 Operating System: %1</source>
         <translation>
 Operētājsistēma: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 CPU Arhitektūra: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 Language: %1</source>
         <translation>
 Valoda: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="93"/>
         <source>Should we ask you later?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Don&apos;t ask me again</source>
         <translation>Vairs nejautāt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Ask later</source>
         <translation>Pajautāt vēlāk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
         <source>Submit user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask again?</source>
         <translation>Pajautāt velreiz?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="17"/>
         <source>Send</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>
 OS CPU Arhitektūra: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="121"/>
         <source>The following error occurred:</source>
         <translation>Sekojoša kļūda gadījas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>Please check your internet connection.</source>
         <translation>Lūdzu, pārbaudiet interneta pieslēgšanu.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="131"/>
         <source>Survey successfully submitted.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="136"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation>Gadījas kļūda pārbaudot atjaunāšanas.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -5051,12 +5301,12 @@ OS CPU Arhitektūra: %1</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>Description</source>
         <translation>Apraksts</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -5104,12 +5354,12 @@ OS CPU Arhitektūra: %1</translation>
         <translation>Augšupielādēt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="247"/>
         <source>Operation timed out</source>
         <translation>Procesa izpilīdšanas laiks pārsniedza robežus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="268"/>
         <source>Transferring data...</source>
         <translation type="unfinished"/>
     </message>
@@ -5117,17 +5367,17 @@ OS CPU Arhitektūra: %1</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Type</source>
         <translation>Tips</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Weight</source>
         <translation>Svars</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="496"/>
+        <location filename="../qt-ui/models.cpp" line="500"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Noklikšķot šeit Jūs noņemsiet svara sistēmu.</translation>
     </message>
@@ -5135,19 +5385,19 @@ OS CPU Arhitektūra: %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1479"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1487"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1497"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1555"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1566"/>
         <source>Failed!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1506"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1576"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1580"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -5155,79 +5405,79 @@ OS CPU Arhitektūra: %1</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1841"/>
+        <location filename="../qt-ui/models.cpp" line="1847"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Gads
 &gt; Mēnesis / Ceļojums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1844"/>
+        <location filename="../qt-ui/models.cpp" line="1850"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1847"/>
+        <location filename="../qt-ui/models.cpp" line="1853"/>
         <source>Duration 
  Total</source>
         <translation>Ilgums
 Kopā</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1850"/>
+        <location filename="../qt-ui/models.cpp" line="1856"/>
         <source>
 Average</source>
         <translation>
 Vidējais</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1853"/>
+        <location filename="../qt-ui/models.cpp" line="1859"/>
         <source>
 Shortest</source>
         <translation>
 Īsakais</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1856"/>
+        <location filename="../qt-ui/models.cpp" line="1862"/>
         <source>
 Longest</source>
         <translation>
 Garākais</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1859"/>
+        <location filename="../qt-ui/models.cpp" line="1865"/>
         <source>Depth (%1)
  Average</source>
         <translation>Dziļums (%1)
 Vidējais</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1862"/>
-        <location filename="../qt-ui/models.cpp" line="1871"/>
-        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>
 Minimum</source>
         <translation>
 Minimums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1865"/>
-        <location filename="../qt-ui/models.cpp" line="1874"/>
-        <location filename="../qt-ui/models.cpp" line="1883"/>
+        <location filename="../qt-ui/models.cpp" line="1871"/>
+        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>
 Maximum</source>
         <translation>
 Maksimums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1874"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Vidējais</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1883"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -5308,40 +5558,40 @@ Vidējais</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1508"/>
+        <location filename="../dive.c" line="1530"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) vai (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="464"/>
+        <location filename="../divelist.c" line="467"/>
         <location filename="../equipment.c" line="81"/>
-        <location filename="../planner.c" line="1060"/>
-        <location filename="../planner.c" line="1063"/>
+        <location filename="../planner.c" line="1081"/>
+        <location filename="../planner.c" line="1084"/>
         <source>air</source>
         <translation>gaiss</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="192"/>
+        <location filename="../equipment.c" line="194"/>
         <source>integrated</source>
         <translation>integrēts</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="193"/>
+        <location filename="../equipment.c" line="195"/>
         <source>belt</source>
         <translation>josta</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="194"/>
+        <location filename="../equipment.c" line="196"/>
         <source>ankle</source>
         <translation>svars uz kājām</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="195"/>
+        <location filename="../equipment.c" line="197"/>
         <source>backplate weight</source>
         <translation>svars uz plātni</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="196"/>
+        <location filename="../equipment.c" line="198"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -5349,7 +5599,7 @@ Vidējais</translation>
         <location filename="../file.c" line="112"/>
         <location filename="../file.c" line="434"/>
         <location filename="../file.c" line="506"/>
-        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="925"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Neizdevas nolasīt &apos;%s&apos;</translation>
     </message>
@@ -5406,9 +5656,9 @@ Vidējais</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../file.c" line="869"/>
-        <location filename="../file.c" line="909"/>
-        <location filename="../file.c" line="1007"/>
+        <location filename="../file.c" line="870"/>
+        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="1016"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>Maksimālais atbalstītais stabu skaits CSV importēšanai ir %d</translation>
     </message>
@@ -5579,27 +5829,27 @@ Vidējais</translation>
         <translation>kļūdains notikuma numurs</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="421"/>
+        <location filename="../libdivecomputer.c" line="419"/>
         <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="427"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Error registering the data</source>
         <translation>Kļūda reģistrējot datus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="433"/>
         <source>Error parsing the datetime</source>
         <translation>Kļūda parsējot laiku</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Dive %d: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="455"/>
+        <location filename="../libdivecomputer.c" line="454"/>
         <source>Error parsing the divetime</source>
         <translation>Kļūda parsējot niršanas laiku</translation>
     </message>
@@ -5609,156 +5859,156 @@ Vidējais</translation>
         <translation>Kļūda parsējot maks. dziļumu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="482"/>
+        <location filename="../libdivecomputer.c" line="483"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="501"/>
+        <location filename="../libdivecomputer.c" line="503"/>
         <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="513"/>
+        <location filename="../libdivecomputer.c" line="515"/>
         <source>Error obtaining water salinity</source>
         <translation>Kļūda ūdens sāļuma noteikšanā</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="521"/>
+        <location filename="../libdivecomputer.c" line="524"/>
         <source>Error obtaining surface pressure</source>
         <translation>Kļūda spiediena noteikšanā uz virsmu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="545"/>
+        <location filename="../libdivecomputer.c" line="549"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="562"/>
+        <location filename="../libdivecomputer.c" line="569"/>
         <source>Error parsing the gas mix</source>
         <translation>Kļūda parsējot gāzes maisījumu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="569"/>
+        <location filename="../libdivecomputer.c" line="576"/>
         <source>Error parsing the samples</source>
         <translation>Kļūda parsējot paraugus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="706"/>
+        <location filename="../libdivecomputer.c" line="713"/>
         <source>Event: waiting for user action</source>
         <translation>Notikums: gaida lietotāja darbību</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="714"/>
+        <location filename="../libdivecomputer.c" line="721"/>
         <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="778"/>
+        <location filename="../libdivecomputer.c" line="785"/>
         <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="783"/>
+        <location filename="../libdivecomputer.c" line="790"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Error registering the cancellation handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="804"/>
+        <location filename="../libdivecomputer.c" line="811"/>
         <source>Dive data import error</source>
         <translation>Kļūda importējot niršanas datus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="843"/>
+        <location filename="../libdivecomputer.c" line="850"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Nav iespējams izveidot libdivecomputer kontekstu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="850"/>
+        <location filename="../libdivecomputer.c" line="857"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Nevar atvērt %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="858"/>
+        <location filename="../libdivecomputer.c" line="865"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="506"/>
+        <location filename="../parse-xml.c" line="516"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Dīvaina procentu nolasīšana %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1760"/>
+        <location filename="../parse-xml.c" line="1770"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Kļūme parsējot &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1989"/>
-        <location filename="../parse-xml.c" line="2137"/>
+        <location filename="../parse-xml.c" line="1999"/>
+        <location filename="../parse-xml.c" line="2147"/>
         <source>Database query dm4_events failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1996"/>
-        <location filename="../parse-xml.c" line="2144"/>
+        <location filename="../parse-xml.c" line="2006"/>
+        <location filename="../parse-xml.c" line="2154"/>
         <source>Database query dm4_tags failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2318"/>
+        <location filename="../parse-xml.c" line="2328"/>
         <source>Database query shearwater_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2325"/>
+        <location filename="../parse-xml.c" line="2335"/>
         <source>Database query shearwater_changes failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2332"/>
+        <location filename="../parse-xml.c" line="2342"/>
         <source>Database query shearwater_profile_sample failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2451"/>
+        <location filename="../parse-xml.c" line="2461"/>
         <source>Database query cobalt_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2458"/>
+        <location filename="../parse-xml.c" line="2468"/>
         <source>Database query cobalt_buddies failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2465"/>
+        <location filename="../parse-xml.c" line="2475"/>
         <source>Database query cobalt_visibility failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2472"/>
+        <location filename="../parse-xml.c" line="2482"/>
         <source>Database query cobalt_location failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2479"/>
+        <location filename="../parse-xml.c" line="2489"/>
         <source>Database query cobalt_location (site) failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2486"/>
+        <location filename="../parse-xml.c" line="2496"/>
         <source>Database query cobalt_profile_sample failed.
 </source>
         <translation type="unfinished"/>
@@ -5771,17 +6021,17 @@ Vidējais</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2168"/>
-        <location filename="../parse-xml.c" line="2189"/>
-        <location filename="../parse-xml.c" line="2508"/>
-        <location filename="../parse-xml.c" line="2527"/>
+        <location filename="../parse-xml.c" line="2178"/>
+        <location filename="../parse-xml.c" line="2199"/>
+        <location filename="../parse-xml.c" line="2518"/>
+        <location filename="../parse-xml.c" line="2537"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Kļūme vaicājot datubāzi &apos;@s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2848"/>
+        <location filename="../parse-xml.c" line="2909"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Nevar atvērts stila lapu %s</translation>
     </message>
@@ -5791,161 +6041,167 @@ Vidējais</translation>
         <translation>EAN</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="820"/>
+        <location filename="../planner.c" line="841"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Nevar atrast gāzi %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="356"/>
+        <location filename="../planner.c" line="363"/>
         <source>Too many gas mixes</source>
         <translation>Parāk daudz gāzes maisījumu</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="540"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="548"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation>Pamatots uz GFlow = %d un GFhigh = %d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="544"/>
+        <location filename="../planner.c" line="551"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface niršanas plāns</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="548"/>
+        <location filename="../planner.c" line="555"/>
         <source>depth</source>
         <translation>dziļums</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="558"/>
         <source>runtime</source>
         <translation>izpildlaiks</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="554"/>
+        <location filename="../planner.c" line="561"/>
         <source>duration</source>
         <translation>ilgums</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="557"/>
+        <location filename="../planner.c" line="564"/>
         <source>gas</source>
         <translation>gāze</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="594"/>
+        <location filename="../planner.c" line="601"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="602"/>
+        <location filename="../planner.c" line="609"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Pāreja uz %.*f %s pēc %d:%02d min - izpildlaiks %d:%02u ar maisījumu %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="615"/>
+        <location filename="../planner.c" line="622"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="622"/>
+        <location filename="../planner.c" line="629"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Apturēties uz %.*f %s uz %d:%02d min - izpildlaiks %d:%02u uz maisījuma %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="635"/>
+        <location filename="../planner.c" line="642"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="638"/>
-        <location filename="../planner.c" line="642"/>
+        <location filename="../planner.c" line="645"/>
+        <location filename="../planner.c" line="649"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="651"/>
+        <location filename="../planner.c" line="658"/>
         <source>(SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="676"/>
+        <location filename="../planner.c" line="683"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="678"/>
+        <location filename="../planner.c" line="685"/>
         <source>Switch gas to %s</source>
         <translation>Pārslēgt gāzi uz %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="697"/>
+        <location filename="../planner.c" line="704"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="699"/>
+        <location filename="../planner.c" line="706"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="710"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="705"/>
+        <location filename="../planner.c" line="712"/>
         <source>Gas consumption:</source>
         <translation>Gāzes patēriņš:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="535"/>
-        <location filename="../planner.c" line="725"/>
-        <location filename="../planner.c" line="730"/>
-        <location filename="../planner.c" line="753"/>
+        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="732"/>
+        <location filename="../planner.c" line="737"/>
+        <location filename="../planner.c" line="762"/>
+        <location filename="../planner.c" line="772"/>
         <source>Warning:</source>
         <translation>Brīdinājums:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="523"/>
+        <location filename="../planner.c" line="530"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="726"/>
+        <location filename="../planner.c" line="733"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="731"/>
+        <location filename="../planner.c" line="738"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="733"/>
+        <location filename="../planner.c" line="740"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="735"/>
+        <location filename="../planner.c" line="742"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="759"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="1064"/>
+        <location filename="../planner.c" line="769"/>
+        <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="1085"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1099"/>
+        <location filename="../profile.c" line="1113"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -5954,70 +6210,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1102"/>
+        <location filename="../profile.c" line="1116"/>
         <source>P: %d%s
 </source>
         <translation>S: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1106"/>
+        <location filename="../profile.c" line="1120"/>
         <source>T: %.1f%s
 </source>
         <translation>L: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1112"/>
+        <location filename="../profile.c" line="1126"/>
         <source>V: %.1f%s
 </source>
         <translation>Ā: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1115"/>
+        <location filename="../profile.c" line="1129"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1117"/>
+        <location filename="../profile.c" line="1131"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1119"/>
+        <location filename="../profile.c" line="1133"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1121"/>
+        <location filename="../profile.c" line="1135"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1123"/>
+        <location filename="../profile.c" line="1137"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1140"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1147"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -6026,7 +6282,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1137"/>
+        <location filename="../profile.c" line="1151"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -6035,49 +6291,49 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1149"/>
+        <location filename="../profile.c" line="1163"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Drošības apstāšana: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1152"/>
+        <location filename="../profile.c" line="1166"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Drošības apstāšana: nez. laiks @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1157"/>
+        <location filename="../profile.c" line="1171"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Dekompr.: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1174"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Dekompr.: nez. laiks @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1178"/>
         <source>In deco
 </source>
         <translation>Dekompresijā
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1166"/>
+        <location filename="../profile.c" line="1180"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1183"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
@@ -6086,99 +6342,99 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1172"/>
+        <location filename="../profile.c" line="1186"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Dekompr.: %umin @ %.0f%s (izrēķ.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1180"/>
+        <location filename="../profile.c" line="1194"/>
         <source>In deco (calc)
 </source>
         <translation>Dekompresijā (izrēķ.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1196"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (izrēķ.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1185"/>
+        <location filename="../profile.c" line="1199"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (izrēķ.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1188"/>
+        <location filename="../profile.c" line="1202"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Aprēķināta maks. dekompr. pietura %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1194"/>
+        <location filename="../profile.c" line="1208"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Audu līmenis %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1214"/>
         <source>heartbeat: %d
 </source>
         <translation>sirdspuksti: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1202"/>
+        <location filename="../profile.c" line="1216"/>
         <source>bearing: %d
 </source>
         <translation>azimuts: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1205"/>
+        <location filename="../profile.c" line="1219"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1314"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1304"/>
-        <location filename="../profile.c" line="1308"/>
-        <location filename="../profile.c" line="1312"/>
+        <location filename="../profile.c" line="1318"/>
+        <location filename="../profile.c" line="1322"/>
+        <location filename="../profile.c" line="1326"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1316"/>
+        <location filename="../profile.c" line="1330"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1334"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1324"/>
-        <location filename="../profile.c" line="1328"/>
+        <location filename="../profile.c" line="1338"/>
+        <location filename="../profile.c" line="1342"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1335"/>
+        <location filename="../profile.c" line="1349"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -6309,6 +6565,7 @@ EADD: %d%s
     </message>
     <message>
         <location filename="../dive.c" line="30"/>
+        <location filename="../equipment.c" line="85"/>
         <source>oxygen</source>
         <translation type="unfinished"/>
     </message>
@@ -6363,97 +6620,97 @@ EADD: %d%s
         <translation>(nav niršanas)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sun</source>
         <translation>Svēt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Mon</source>
         <translation>Pirm</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Tue</source>
         <translation>Otr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Wed</source>
         <translation>Treš</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Thu</source>
         <translation>Cet</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Fri</source>
         <translation>Piekt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sat</source>
         <translation>Sest</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>May</source>
         <translation>Maijs</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jun</source>
         <translation>Jūn</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Jul</source>
         <translation>Jūl</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Dec</source>
         <translation>Dec</translation>
     </message>
@@ -7057,13 +7314,13 @@ Vai Uemis Zurich ir pareizi pieslēgts?</translation>
         <translation>Plānošana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
         <source>GF low</source>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>%</source>
         <translation type="unfinished"/>
     </message>
@@ -7073,7 +7330,7 @@ Vai Uemis Zurich ir pareizi pieslēgts?</translation>
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="335"/>
         <source>Drop to first depth</source>
         <translation type="unfinished"/>
     </message>
@@ -7083,69 +7340,69 @@ Vai Uemis Zurich ir pareizi pieslēgts?</translation>
         <translation>Pēdējā pietura pie 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
         <source>Plan backgas breaks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="355"/>
         <source>Gas options</source>
         <translation>Gāzes opcijas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="376"/>
         <source>Bottom SAC</source>
         <translation>Apakšējais SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="383"/>
         <source>Deco SAC</source>
         <translation>Deko SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="380"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="390"/>
         <source>Bottom pO₂</source>
         <translation>Apakšējais pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="403"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="413"/>
         <source>Deco pO₂</source>
         <translation>Deko pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="449"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="462"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="478"/>
         <source>Dive notes</source>
         <translation>Niršanas piezīmes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
         <source>Display runtime</source>
         <translation>Izrādīt izpildlaiku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <source>Display segment duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="531"/>
         <source>Display transitions in deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="538"/>
         <source>Verbatim dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="387"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="410"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="397"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -7165,17 +7422,17 @@ Vai Uemis Zurich ir pareizi pieslēgts?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="499"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="515"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts
index 035effe67..6131e147b 100644
--- a/translations/subsurface_nb_NO.ts
+++ b/translations/subsurface_nb_NO.ts
@@ -3,12 +3,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="539"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="522"/>
         <source>Person: </source>
         <translation>Person: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="540"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="523"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Søk etter buddyer og dykkeledere</translation>
     </message>
@@ -16,40 +16,188 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="233"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="230"/>
         <source>No buddies</source>
         <translation>Ingen buddyer</translation>
     </message>
 </context>
 <context>
+    <name>ColumnNameProvider</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>GPS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Avg depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="210"/>
+        <location filename="../configuredivecomputer.cpp" line="212"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation>Kunne ikke lagre backupfila %1. Feilmelding: %2</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="226"/>
+        <location filename="../configuredivecomputer.cpp" line="228"/>
         <source>Could not open backup file: %1</source>
         <translation>Kunne ikke åpne backupfila: %1</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="542"/>
+        <location filename="../configuredivecomputer.cpp" line="552"/>
         <source>Dive computer details read successfully</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="551"/>
+        <location filename="../configuredivecomputer.cpp" line="561"/>
         <source>Setting successfully written to device</source>
         <translation>Lagret til computer</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="560"/>
+        <location filename="../configuredivecomputer.cpp" line="570"/>
         <source>Device firmware successfully updated</source>
         <translation>Firmware på computer er oppdatert</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="569"/>
+        <location filename="../configuredivecomputer.cpp" line="579"/>
         <source>Device settings successfully reset</source>
         <translation>Innstillinger på computer er resatt</translation>
     </message>
@@ -847,70 +995,70 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1053"/>
         <source>Backup files (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1037"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1040"/>
         <source>Backup succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1041"/>
         <source>Your settings have been saved to: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1030"/>
         <source>Backup dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1036"/>
         <source>XML backup error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1052"/>
         <source>Restore dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1056"/>
         <source>XML restore error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1057"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1063"/>
         <source>Restore succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1064"/>
         <source>Your settings have been restored successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1074"/>
         <source>Select firmware file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1075"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -968,12 +1116,12 @@
         <translation>Klikk her for å fjerne denne flaska.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="410"/>
         <source>Cylinder cannot be removed</source>
         <translation>Flaska kan ikke fjernes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="407"/>
+        <location filename="../qt-ui/models.cpp" line="411"/>
         <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>
@@ -1049,12 +1197,12 @@
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="48"/>
         <source>Remove the selected dive computer?</source>
         <translation>Fjern valgte dykkecomputer?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="49"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
         <translation>Vil du fjerne den valgte computeren?</translation>
@@ -1068,22 +1216,22 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Model</source>
         <translation>Modell</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Device ID</source>
         <translation>Enhets-ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Nickname</source>
         <translation>Navn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Klikk her for å fjerne denne dykkecomputeren.</translation>
     </message>
@@ -1091,117 +1239,145 @@
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="115"/>
         <source>Bailing out to OC</source>
         <translation>Bytter til OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="117"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> start</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> slutt</translation>
     </message>
 </context>
 <context>
+    <name>DiveImportedModel</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="556"/>
+        <source>Date/time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
+        <source>Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>h:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>min</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1242"/>
+        <location filename="../qt-ui/models.cpp" line="1248"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1245"/>
+        <location filename="../qt-ui/models.cpp" line="1251"/>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1248"/>
+        <location filename="../qt-ui/models.cpp" line="1254"/>
         <source>Rating</source>
         <translation>Vurdering</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1254"/>
+        <location filename="../qt-ui/models.cpp" line="1260"/>
         <source>Duration</source>
         <translation>Varighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1263"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1263"/>
+        <location filename="../qt-ui/models.cpp" line="1269"/>
         <source>Suit</source>
         <translation>Drakt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1266"/>
+        <location filename="../qt-ui/models.cpp" line="1272"/>
         <source>Cyl</source>
         <translation>Flaske</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1269"/>
+        <location filename="../qt-ui/models.cpp" line="1275"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1277"/>
+        <location filename="../qt-ui/models.cpp" line="1283"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1280"/>
+        <location filename="../qt-ui/models.cpp" line="1286"/>
         <source>Max CNS</source>
         <translation>Maks CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1283"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>Location</source>
         <translation>Sted</translation>
     </message>
@@ -1209,87 +1385,87 @@
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="787"/>
+        <location filename="../qt-ui/divelistview.cpp" line="768"/>
         <source>Expand all</source>
         <translation>Fold ut turer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="788"/>
+        <location filename="../qt-ui/divelistview.cpp" line="769"/>
         <source>Collapse all</source>
         <translation>Fold sammen turer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="789"/>
+        <location filename="../qt-ui/divelistview.cpp" line="770"/>
         <source>Collapse others</source>
         <translation>Slå sammen andre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="791"/>
+        <location filename="../qt-ui/divelistview.cpp" line="772"/>
         <source>Remove dive(s) from trip</source>
         <translation>Fjern dykk fra tur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="792"/>
+        <location filename="../qt-ui/divelistview.cpp" line="773"/>
         <source>Create new trip above</source>
         <translation>Lag ny tur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="806"/>
+        <location filename="../qt-ui/divelistview.cpp" line="787"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Legg til dykk til turen over</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="808"/>
+        <location filename="../qt-ui/divelistview.cpp" line="789"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Legg til dykk til turen under</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="812"/>
+        <location filename="../qt-ui/divelistview.cpp" line="793"/>
         <source>Merge trip with trip above</source>
         <translation>Slå samme tur med turen over</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="813"/>
+        <location filename="../qt-ui/divelistview.cpp" line="794"/>
         <source>Merge trip with trip below</source>
         <translation>Slå sammen tur med turen under</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="817"/>
+        <location filename="../qt-ui/divelistview.cpp" line="798"/>
         <source>Delete dive(s)</source>
         <translation>Slett dykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="819"/>
+        <location filename="../qt-ui/divelistview.cpp" line="800"/>
         <source>Mark dive(s) invalid</source>
         <translation>Marker dykk som ugyldige</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="823"/>
+        <location filename="../qt-ui/divelistview.cpp" line="804"/>
         <source>Merge selected dives</source>
         <translation>Slå sammen valgte dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="825"/>
+        <location filename="../qt-ui/divelistview.cpp" line="806"/>
         <source>Renumber dive(s)</source>
         <translation>Renummerer dykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="826"/>
+        <location filename="../qt-ui/divelistview.cpp" line="807"/>
         <source>Shift times</source>
         <translation>Flytt tidspunkter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="827"/>
+        <location filename="../qt-ui/divelistview.cpp" line="808"/>
         <source>Load images</source>
         <translation>Last inn bilder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Open image files</source>
         <translation>Åpne bilder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Bilder (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -1474,100 +1650,100 @@
         <translation>Sand</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF-filer (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="268"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>CSV-filer (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="68"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Generelt format som brukes til datautveksling mellom en mengde dykkerelaterte programmer.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Send dataene til divelogs.de.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>HTML-eksport av dykkestedene, visualisert på et verdenskart.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurface sitt eget XML-format.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
         <source>Write depths of images to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export UDDF file as</source>
         <translation>Eksporter UDDF-filer som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="267"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
         <source>Export CSV file as</source>
         <translation>Eksporter CSV-file som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="278"/>
         <source>Export world map</source>
         <translation>Eksporter verdenskart</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="299"/>
         <source>HTML files (*.html)</source>
         <translation>HTML-filer (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="283"/>
         <source>Export Subsurface XML</source>
         <translation>Eksporter Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="284"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML-filer (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
         <source>Save image depths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="298"/>
         <source>Export HTML files as</source>
         <translation>Eksporter HTML-filer som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
         <source>Can&apos;t open file %s</source>
         <translation>Klarer ikke åpne fila %s</translation>
     </message>
@@ -1580,248 +1756,228 @@
         <translation>Importer dykkelogg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
-        <source>CSV options</source>
-        <translation>CSV-valg</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="281"/>
-        <source>Pre-configured imports</source>
-        <translation>Prekonfigurerte importer</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="122"/>
-        <source>Depth</source>
-        <translation>Dybde</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="142"/>
-        <source>Stopdepth</source>
-        <translation>Stoppdybde</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="162"/>
-        <source>Pressure</source>
-        <translation>Trykk</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="176"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="466"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
         <source>Time</source>
         <translation>Tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="183"/>
-        <source>Temp</source>
-        <translation>Temp</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="213"/>
-        <source>NDL</source>
-        <translation>NDL</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="233"/>
-        <source>TTS</source>
-        <translation>TTS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="253"/>
-        <source>Cns</source>
-        <translation>CNS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="58"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="789"/>
-        <source>Field separator</source>
-        <translation>Feltseparator</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="35"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="363"/>
-        <source>Units</source>
-        <translation>Enheter</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="42"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="370"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="97"/>
         <source>Metric</source>
         <translation>Metrisk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="47"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="375"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="102"/>
         <source>Imperial</source>
         <translation>Britiske mål</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="169"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="298"/>
-        <source>Manual dives</source>
-        <translation>Manuelle dykk</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="316"/>
-        <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="319"/>
-        <source>Date format</source>
-        <translation>Datoformat</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="332"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="59"/>
         <source>dd.mm.yyyy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="337"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="64"/>
         <source>mm/dd/yyyy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="342"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="69"/>
         <source>yyyy-mm-dd</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="392"/>
-        <source>Dive #</source>
-        <translation>Dykk #</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="426"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="439"/>
-        <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+        <source>Dive #</source>
+        <translation>Dykk #</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="429"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="500"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="513"/>
-        <source>Dive duration in seconds or in min:sec format</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="503"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
         <source>Duration</source>
         <translation>Varighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="574"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
         <source>GPS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="591"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
         <source>Tags</source>
         <translation>Emner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="608"/>
-        <source>Cyl size</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+        <source>He</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="625"/>
-        <source>Air temp</source>
-        <translation>Lufttemp.</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="78"/>
+        <source>Seconds</source>
+        <translation>Sekunder</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
+        <source>Minutes</source>
+        <translation>Minutter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="642"/>
-        <source>Start Pressure</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="88"/>
+        <source>Minutes:seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="659"/>
-        <source>Water temp</source>
-        <translation>Vanntemp.</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+        <source>Location</source>
+        <translation>Sted</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+        <source>Max depth</source>
+        <translation>Maksdybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="676"/>
-        <source>End Press</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+        <source>Tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="693"/>
-        <source>O₂</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="710"/>
-        <source>He</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+        <source>Sample time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="742"/>
-        <source>Choose duration format.</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+        <source>Sample depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="745"/>
-        <source>Duration format</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+        <source>Sample temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="758"/>
-        <source>Seconds</source>
-        <translation>Sekunder</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="763"/>
-        <source>Minutes</source>
-        <translation>Minutter</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="768"/>
-        <source>Minutes:seconds</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+        <source>Sample ndl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="540"/>
-        <source>Location</source>
-        <translation>Sted</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="409"/>
-        <source>Max depth</source>
-        <translation>Maksdybde</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="386"/>
-        <source>Field configuration</source>
-        <translation>Feltvalg</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+        <source>Samples pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
         <source>Mean depth</source>
         <translation>Snittdybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="483"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="523"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
         <source>Notes</source>
         <translation>Notater</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="557"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
         <source>Weight</source>
         <translation>Vekt</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DivePlanner</name>
@@ -1864,42 +2020,42 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
         <source>unknown</source>
         <translation>ukjent</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="691"/>
         <source>Final depth</source>
         <translation>Siste dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="693"/>
         <source>Run time</source>
         <translation>Løpetid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="701"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="695"/>
         <source>Duration</source>
         <translation>Varighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="703"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
         <source>Used gas</source>
         <translation>Gassforbruk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="705"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
         <source>CC set point</source>
         <translation>CC settpunkt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1044"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1051"/>
         <source>Discard the plan?</source>
         <translation>Slett planen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1045"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1052"/>
         <source>You are about to discard your plan.</source>
         <translation>Du er i ferd med å forkaste planen.</translation>
     </message>
@@ -1907,22 +2063,22 @@
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="257"/>
         <source>Dive planner points</source>
         <translation>Punkter i dykkplan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="261"/>
         <source>Available gases</source>
         <translation>Tilgjengelige gasser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="284"/>
         <source>Add dive data point</source>
         <translation>Legg til punkt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="304"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="293"/>
         <source>Save new</source>
         <translation type="unfinished"/>
     </message>
@@ -1930,92 +2086,112 @@
 <context>
     <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
         <source>Time</source>
         <translation>Tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
         <source>Pressure</source>
         <translation>Trykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
         <source>Color</source>
         <translation>Farge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
         <source>Pressure S</source>
         <translation>Trykk S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
+        <source>Setpoint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
+        <source>Sensor1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
+        <source>Sensor2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
+        <source>Sensor3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
         <source>Ambient pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
-        <source>Heart Beat</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
+        <source>Heart beat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
-        <source>Gradient Factor</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/>
+        <source>Gradient factor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
-        <source>Mean Depth/s</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
+        <source>Mean depth/s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
         <source>Pressure I</source>
         <translation>Trykk I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
         <source>User entered</source>
         <translation>Brukeren la inn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
         <source>Cylinder index</source>
         <translation>Flaskeindeks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
         <source>Ceiling</source>
         <translation>Tak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
@@ -2066,127 +2242,127 @@
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1437"/>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1443"/>
+        <location filename="../qt-ui/models.cpp" line="1489"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1440"/>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1492"/>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1443"/>
-        <location filename="../qt-ui/models.cpp" line="1489"/>
+        <location filename="../qt-ui/models.cpp" line="1449"/>
+        <location filename="../qt-ui/models.cpp" line="1495"/>
         <source>Rating</source>
         <translation>Vurdering</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1452"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1458"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1461"/>
         <source>Weight</source>
         <translation>Vekt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1458"/>
-        <location filename="../qt-ui/models.cpp" line="1504"/>
+        <location filename="../qt-ui/models.cpp" line="1464"/>
+        <location filename="../qt-ui/models.cpp" line="1510"/>
         <source>Suit</source>
         <translation>Drakt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1461"/>
-        <location filename="../qt-ui/models.cpp" line="1507"/>
+        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1513"/>
         <source>Cyl</source>
         <translation>Flaske</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1464"/>
-        <location filename="../qt-ui/models.cpp" line="1510"/>
+        <location filename="../qt-ui/models.cpp" line="1470"/>
+        <location filename="../qt-ui/models.cpp" line="1516"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1473"/>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1527"/>
         <source>Max CNS</source>
         <translation>Maks CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
-        <location filename="../qt-ui/models.cpp" line="1524"/>
+        <location filename="../qt-ui/models.cpp" line="1482"/>
+        <location filename="../qt-ui/models.cpp" line="1530"/>
         <source>Location</source>
         <translation>Sted</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1449"/>
-        <location filename="../qt-ui/models.cpp" line="1495"/>
+        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1501"/>
         <source>Duration</source>
         <translation>Varighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1498"/>
+        <location filename="../qt-ui/models.cpp" line="1504"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1470"/>
-        <location filename="../qt-ui/models.cpp" line="1518"/>
+        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1524"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -2194,95 +2370,95 @@
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="98"/>
         <source>no dives were selected</source>
         <translation>ingen dykk valgt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="117"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>klarte ikke å lage zipfil for opplasting: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="143"/>
         <source>cannot create temporary file: %s</source>
         <translation>klarte ikke å lage midlertidig fil: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/>
         <source>internal error: %s</source>
         <translation>intern feil: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="169"/>
         <source>internal error</source>
         <translation>intern feil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="629"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="828"/>
         <source>Done</source>
         <translation>Ferdig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/>
         <source>Uploading dive list...</source>
         <translation>Laster opp liste over dykk...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="692"/>
         <source>Downloading dive list...</source>
         <translation>Laster ned liste over dykk...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="741"/>
         <source>Downloading %1 dives...</source>
         <translation>Laster ned %1 dykk...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="785"/>
         <source>Download finished - %1</source>
         <translation>Nedlasting er ferdig - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="802"/>
         <source>Corrupted download</source>
         <translation>Nedlastingen er skadet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Arkivet kunne ikke åpnes:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
         <source>Upload failed</source>
         <translation>Opplasting feilet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/>
         <source>Upload successful</source>
         <translation>Ferdig å laste opp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
         <source>Login failed</source>
         <translation>Innlogging feilet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
         <source>Cannot parse response</source>
         <translation>Kan ikke lese svar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
         <source>Error: %1</source>
         <translation>Feil: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="829"/>
         <source>Upload finished</source>
         <translation>Opplasting er ferdig</translation>
     </message>
@@ -2290,54 +2466,52 @@
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="169"/>
         <source>Error</source>
         <translation>Feil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="400"/>
         <source>Retry</source>
         <translation>Prøv igjen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="264"/>
         <source>Find Uemis dive computer</source>
         <translation>Finn Uemis dykkecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Velg fil som loggfil for dykkecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Log files (*.log)</source>
         <translation>Loggfiler (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="362"/>
         <source>Warning</source>
         <translation>Advarsel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="363"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>Lagring av dump fra libdivecomputer vil IKKE laste ned dykk til dykkeloggen.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="374"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Velg fil som binærdump fra dykkecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="375"/>
         <source>Dump files (*.bin)</source>
         <translation>Dumpfiler (*.bin)</translation>
     </message>
@@ -2345,7 +2519,7 @@
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="101"/>
         <source>Vendor</source>
         <translation>Leverandør</translation>
     </message>
@@ -2355,54 +2529,74 @@
         <translation>Last ned fra dykkecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="31"/>
         <source>Device or mount point</source>
         <translation>Enhet eller disk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="111"/>
         <source>Dive computer</source>
         <translation>Dykkecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="132"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="45"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="80"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="94"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="52"/>
         <source>Force download of all dives</source>
         <translation>Tvungen nedlasting av alle dykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
         <source>Always prefer downloaded dives</source>
         <translation>Foretrekk alltid nedlastede dykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="189"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/>
+        <source>Downloaded Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
+        <source>Select all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
+        <source>Unselect all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
         <source>Save libdivecomputer logfile</source>
         <translation>Lagre loggfil fra libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="87"/>
         <source>Save libdivecomputer dumpfile</source>
         <translation>Lagre dumpfil fra libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
         <source>Download into new trip</source>
         <translation type="unfinished"/>
     </message>
@@ -2410,12 +2604,12 @@
 <context>
     <name>ExtraDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Value</source>
         <translation type="unfinished"/>
     </message>
@@ -2429,21 +2623,21 @@
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="245"/>
-        <source>Your dive profile was updated to facebook.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
-        <source>Photo Upload Failed</source>
+        <source>Your dive profile was updated to Facebook.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="250"/>
-        <source>Your dive profile was not updated to facebook, 
+        <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+        <source>Photo Upload Failed</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>FilterWidget</name>
@@ -2484,17 +2678,17 @@
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1544"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1621"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1624"/>
         <source>Firmware update failed!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1550"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1627"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -2502,7 +2696,7 @@
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="128"/>
+        <location filename="../qt-ui/globe.cpp" line="119"/>
         <source>Edit selected dive locations</source>
         <translation>Rediger valgte steder</translation>
     </message>
@@ -2510,7 +2704,7 @@
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="566"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="549"/>
         <source>Location: </source>
         <translation type="unfinished"/>
     </message>
@@ -2518,7 +2712,7 @@
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="286"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="283"/>
         <source>No location set</source>
         <translation type="unfinished"/>
     </message>
@@ -2526,330 +2720,335 @@
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="133"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
+        <location filename="../qt-ui/maintab.cpp" line="497"/>
         <source>Location</source>
         <translation>Sted</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="67"/>
         <source>Coordinates</source>
         <translation>Koordinater</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="169"/>
         <source>Divemaster</source>
         <translation>Dykkeleder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="154"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="222"/>
+        <location filename="../qt-ui/maintab.ui" line="277"/>
         <source>Tags</source>
         <translation>Emner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="186"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
         <source>Rating</source>
         <translation>Vurdering</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="221"/>
         <source>Visibility</source>
         <translation>Sikt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="230"/>
         <source>Suit</source>
         <translation>Drakt</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="465"/>
+        <location filename="../qt-ui/maintab.cpp" line="470"/>
         <source>Dive notes</source>
         <translation>Notater</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
-        <location filename="../qt-ui/maintab.ui" line="648"/>
-        <location filename="../qt-ui/maintab.cpp" line="277"/>
+        <location filename="../qt-ui/maintab.ui" line="74"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="102"/>
+        <location filename="../qt-ui/maintab.ui" line="677"/>
+        <location filename="../qt-ui/maintab.cpp" line="279"/>
         <source>Air temp.</source>
         <translation>Lufttemp.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <location filename="../qt-ui/maintab.ui" line="667"/>
-        <location filename="../qt-ui/maintab.cpp" line="278"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.ui" line="696"/>
+        <location filename="../qt-ui/maintab.cpp" line="280"/>
         <source>Water temp.</source>
         <translation>Vanntemp.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="229"/>
-        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.ui" line="284"/>
+        <location filename="../qt-ui/maintab.cpp" line="498"/>
         <source>Notes</source>
         <translation>Notater</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="369"/>
+        <location filename="../qt-ui/maintab.ui" line="398"/>
         <source>Equipment</source>
         <translation>Utstyr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="496"/>
+        <location filename="../qt-ui/maintab.ui" line="525"/>
         <source>Gases used</source>
         <translation>Brukte gasser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="515"/>
+        <location filename="../qt-ui/maintab.ui" line="544"/>
         <source>Gas consumed</source>
         <translation>Gassforbruk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="553"/>
+        <location filename="../qt-ui/maintab.ui" line="582"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="591"/>
+        <location filename="../qt-ui/maintab.ui" line="620"/>
         <source>Max. depth</source>
         <translation>Maksdybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="629"/>
+        <location filename="../qt-ui/maintab.ui" line="658"/>
         <source>Air pressure</source>
         <translation>Lufttrykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="686"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>Dive time</source>
         <translation>Varighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="845"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
         <source>Total time</source>
         <translation>Totaltid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="903"/>
+        <location filename="../qt-ui/maintab.ui" line="932"/>
         <source>Gas consumption</source>
         <translation>Gassforbruk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="962"/>
+        <location filename="../qt-ui/maintab.ui" line="991"/>
         <source>Extra data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="968"/>
+        <location filename="../qt-ui/maintab.ui" line="997"/>
         <source>Additional data from dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="54"/>
-        <location filename="../qt-ui/maintab.ui" line="458"/>
+        <location filename="../qt-ui/maintab.ui" line="83"/>
+        <location filename="../qt-ui/maintab.ui" line="487"/>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="61"/>
+        <location filename="../qt-ui/maintab.ui" line="90"/>
         <source>Time</source>
         <translation>Tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="425"/>
+        <location filename="../qt-ui/maintab.ui" line="454"/>
         <source>Dive info</source>
         <translation>Detaljer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="477"/>
+        <location filename="../qt-ui/maintab.ui" line="506"/>
         <source>Interval</source>
         <translation>Overflateintervall</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="534"/>
-        <location filename="../qt-ui/maintab.ui" line="799"/>
+        <location filename="../qt-ui/maintab.ui" line="563"/>
+        <location filename="../qt-ui/maintab.ui" line="828"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="610"/>
+        <location filename="../qt-ui/maintab.ui" line="639"/>
         <source>Avg. depth</source>
         <translation>Snittdybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="572"/>
+        <location filename="../qt-ui/maintab.ui" line="601"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="734"/>
         <source>Salinity</source>
         <translation>Saltholdighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="742"/>
+        <location filename="../qt-ui/maintab.ui" line="771"/>
         <source>Stats</source>
         <translation>Statistikk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="775"/>
+        <location filename="../qt-ui/maintab.ui" line="804"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="787"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="813"/>
+        <location filename="../qt-ui/maintab.ui" line="842"/>
         <source>Duration</source>
         <translation>Varighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="864"/>
+        <location filename="../qt-ui/maintab.ui" line="893"/>
         <source>Dives</source>
         <translation>Dykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="948"/>
+        <location filename="../qt-ui/maintab.ui" line="977"/>
         <source>Photos</source>
         <translation>Bilder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="95"/>
+        <location filename="../qt-ui/maintab.cpp" line="87"/>
         <source>Cylinders</source>
         <translation>Flasker</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="99"/>
+        <location filename="../qt-ui/maintab.cpp" line="91"/>
         <source>Weights</source>
         <translation>Vekter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="55"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Apply changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="59"/>
+        <location filename="../qt-ui/maintab.cpp" line="50"/>
         <source>Discard changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="96"/>
+        <location filename="../qt-ui/maintab.cpp" line="88"/>
         <source>Add cylinder</source>
         <translation>Legg til flaske</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="100"/>
+        <location filename="../qt-ui/maintab.cpp" line="92"/>
         <source>Add weight system</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="274"/>
+        <location filename="../qt-ui/maintab.cpp" line="276"/>
         <source>Air temp. [%1]</source>
         <translation>Lufttemp. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="275"/>
+        <location filename="../qt-ui/maintab.cpp" line="277"/>
         <source>Water temp. [%1]</source>
         <translation>Vanntemp. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="312"/>
+        <location filename="../qt-ui/maintab.cpp" line="314"/>
         <source>This trip is being edited.</source>
         <translation>Denne turen redigeres.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="320"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Multiple dives are being edited.</source>
         <translation>Flere dykk redigeres.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.cpp" line="324"/>
         <source>This dive is being edited.</source>
         <translation>Dette dykket redigeres.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="436"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
+        <location filename="../qt-ui/maintab.cpp" line="465"/>
         <source>Trip notes</source>
         <translation>Turnotater</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="458"/>
+        <location filename="../qt-ui/maintab.cpp" line="463"/>
         <source>Trip location</source>
         <translation>Tursted</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="526"/>
-        <location filename="../qt-ui/maintab.cpp" line="558"/>
-        <location filename="../qt-ui/maintab.cpp" line="562"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
         <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="574"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="555"/>
+        <location filename="../qt-ui/maintab.cpp" line="563"/>
         <source>Deepest dive</source>
         <translation>Dypeste dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="556"/>
+        <location filename="../qt-ui/maintab.cpp" line="564"/>
         <source>Shallowest dive</source>
         <translation>Grunneste dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="569"/>
+        <location filename="../qt-ui/maintab.cpp" line="577"/>
         <source>Highest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="578"/>
         <source>Lowest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="571"/>
+        <location filename="../qt-ui/maintab.cpp" line="579"/>
         <source>Average total SAC of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="582"/>
+        <location filename="../qt-ui/maintab.cpp" line="590"/>
         <source>Highest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="583"/>
+        <location filename="../qt-ui/maintab.cpp" line="591"/>
         <source>Lowest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="584"/>
+        <location filename="../qt-ui/maintab.cpp" line="592"/>
         <source>Average temperature of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="594"/>
+        <location filename="../qt-ui/maintab.cpp" line="602"/>
         <source>Longest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="595"/>
+        <location filename="../qt-ui/maintab.cpp" line="603"/>
         <source>Shortest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="596"/>
+        <location filename="../qt-ui/maintab.cpp" line="604"/>
         <source>Average length of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="620"/>
+        <location filename="../qt-ui/maintab.cpp" line="628"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -2858,17 +3057,17 @@ fra luft og bruker:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="624"/>
+        <location filename="../qt-ui/maintab.cpp" line="632"/>
         <source> and </source>
         <translation>og</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="911"/>
+        <location filename="../qt-ui/maintab.cpp" line="925"/>
         <source>Discard the changes?</source>
         <translation>Slette endringer?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="912"/>
+        <location filename="../qt-ui/maintab.cpp" line="926"/>
         <source>You are about to discard your changes.</source>
         <translation>Du er i ferd med å droppe endringene dine.</translation>
     </message>
@@ -3015,7 +3214,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="296"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="232"/>
         <source>Open</source>
         <translation>Åpne</translation>
     </message>
@@ -3375,90 +3574,90 @@ p, li { white-space: pre-wrap; }
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="252"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="229"/>
         <source>Open file</source>
         <translation>Åpne fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="256"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="233"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="332"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="309"/>
         <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="444"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
         <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="491"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
         <source>Print runtime table</source>
         <translation>Skriv ut løpetidstabel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="834"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="811"/>
         <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="836"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="813"/>
         <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="841"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="818"/>
         <source>Save changes?</source>
         <translation>Lagre endringer?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1196"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1173"/>
         <source>Save file as</source>
         <translation>Lagre fil som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1337"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1314"/>
         <source>Open dive log file</source>
         <translation>Åpne dykkelogg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="819"/>
         <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="300"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="444"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="277"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Warning</source>
         <translation>Advarsel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1180"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1157"/>
         <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="625"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="602"/>
         <source>Yearly statistics</source>
         <translation>Årsstatistikk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1197"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1174"/>
         <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="1338"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1315"/>
         <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <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>
@@ -3466,7 +3665,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="651"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="634"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation type="unfinished"/>
     </message>
@@ -3474,39 +3673,39 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="239"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="243"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="244"/>
         <source>Not now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="245"/>
         <source>Update firmware</source>
         <translation>Oppdater firmware</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
         <source>Firmware upgrade notice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
         <source>Save the downloaded firmware as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
         <source>HEX files (*.hex)</source>
         <translation type="unfinished"/>
     </message>
@@ -3514,54 +3713,69 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Open circuit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="481"/>
         <source>Last stop at 20ft</source>
         <translation>Siste stopp ved 20ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="482"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% av snittdybde til 20ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="489"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
         <source>20ft to surface</source>
         <translation>20ft til overflaten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="485"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
         <source>Last stop at 6m</source>
         <translation>Siste stopp ved 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% av snittdybde til 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="494"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
         <source>6m to surface</source>
         <translation>6m til overflaten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="497"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="498"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
         <source>cuft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="506"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="507"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="500"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="501"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
@@ -3680,6 +3894,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="816"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -3714,57 +3929,87 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="795"/>
+        <source>CCR: Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="809"/>
+        <source>Default CCR set-point for dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="832"/>
+        <source>pSCR O₂ metabolism rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="839"/>
+        <source>pSCR ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="846"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="859"/>
+        <source>1:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="875"/>
         <source>System default</source>
         <translation>Systemstandard</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="843"/>
+        <location filename="../qt-ui/preferences.ui" line="914"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="849"/>
+        <location filename="../qt-ui/preferences.ui" line="920"/>
         <source>Proxy type</source>
         <translation>Proxytype</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="862"/>
+        <location filename="../qt-ui/preferences.ui" line="933"/>
         <source>Host</source>
         <translation>Tjener</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="888"/>
+        <location filename="../qt-ui/preferences.ui" line="959"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="914"/>
+        <location filename="../qt-ui/preferences.ui" line="985"/>
         <source>Requires authentication</source>
         <translation>Krever autentisering</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="934"/>
+        <location filename="../qt-ui/preferences.ui" line="1005"/>
         <source>Username</source>
         <translation>Brukernavn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="957"/>
+        <location filename="../qt-ui/preferences.ui" line="1028"/>
         <source>Password</source>
         <translation>Passord</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="985"/>
-        <source>about:blank</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="1011"/>
-        <source>Disconnect from facebook</source>
+        <location filename="../qt-ui/preferences.ui" line="1079"/>
+        <source>Disconnect from Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="824"/>
+        <location filename="../qt-ui/preferences.ui" line="895"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
@@ -3919,52 +4164,52 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>GF høy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="28"/>
+        <location filename="../qt-ui/preferences.cpp" line="44"/>
         <source>No proxy</source>
         <translation>Ingen proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="29"/>
+        <location filename="../qt-ui/preferences.cpp" line="45"/>
         <source>System proxy</source>
         <translation>System-proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="30"/>
+        <location filename="../qt-ui/preferences.cpp" line="46"/>
         <source>HTTP proxy</source>
         <translation>HTTP-proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="31"/>
+        <location filename="../qt-ui/preferences.cpp" line="47"/>
         <source>SOCKS proxy</source>
         <translation>SOCKS-proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="291"/>
+        <location filename="../qt-ui/preferences.cpp" line="324"/>
         <source>Restart required</source>
         <translation>Programmet må startes på nytt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="292"/>
+        <location filename="../qt-ui/preferences.cpp" line="325"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>For å bytte språk må du starte Subsurface på nytt.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="456"/>
+        <location filename="../qt-ui/preferences.cpp" line="494"/>
         <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
         <translation>Hvis du velger OK vil alle innstillinger bli satt til standardverdier.  Dette skjer umiddelbart.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML-filer (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Open default log file</source>
         <translation>Åpne standardloggfil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="455"/>
+        <location filename="../qt-ui/preferences.cpp" line="493"/>
         <source>Warning</source>
         <translation>Advarsel</translation>
     </message>
@@ -3972,17 +4217,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="91"/>
+        <location filename="../qt-ui/printdialog.cpp" line="85"/>
         <source>&amp;Preview</source>
         <translation>Forhåndsvisning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="88"/>
+        <location filename="../qt-ui/printdialog.cpp" line="82"/>
         <source>P&amp;rint</source>
         <translation>Skriv ut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="103"/>
+        <location filename="../qt-ui/printdialog.cpp" line="97"/>
         <source>Print</source>
         <translation>Skriv ut</translation>
     </message>
@@ -3990,42 +4235,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="20"/>
         <source>Dive#</source>
         <translation>Dykk nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="21"/>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="22"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="23"/>
         <source>Duration</source>
         <translation>Varighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Master</source>
         <translation>Master</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="34"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Location</source>
         <translation>Sted</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <location filename="../qt-ui/printlayout.cpp" line="63"/>
         <source>Subsurface cannot find a usable printer on this system!</source>
         <translation type="unfinished"/>
     </message>
@@ -4091,72 +4336,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2095"/>
+        <location filename="../qt-ui/models.cpp" line="2101"/>
         <source>unknown</source>
         <translation>ukjent</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2100"/>
+        <location filename="../qt-ui/models.cpp" line="2106"/>
         <source>Dive #%1 - %2</source>
         <translation>Dykk nr. %1- %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2103"/>
+        <location filename="../qt-ui/models.cpp" line="2109"/>
         <source>Max depth: %1 %2</source>
         <translation>Max dybde: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2110"/>
+        <location filename="../qt-ui/models.cpp" line="2116"/>
         <source>Duration: %1 min</source>
         <translation>Varighet: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2115"/>
+        <location filename="../qt-ui/models.cpp" line="2121"/>
         <source>Gas used:</source>
         <translation>Gassforbruk:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2117"/>
+        <location filename="../qt-ui/models.cpp" line="2123"/>
         <source>Tags:</source>
         <translation>Emneord:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2119"/>
+        <location filename="../qt-ui/models.cpp" line="2125"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2121"/>
+        <location filename="../qt-ui/models.cpp" line="2127"/>
         <source>Weights:</source>
         <translation>Vekter:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2126"/>
+        <location filename="../qt-ui/models.cpp" line="2132"/>
         <source>Notes:</source>
         <translation>Notater:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2133"/>
+        <location filename="../qt-ui/models.cpp" line="2139"/>
         <source>Divemaster:</source>
         <translation>Dykkeleder:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2135"/>
+        <location filename="../qt-ui/models.cpp" line="2141"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2137"/>
+        <location filename="../qt-ui/models.cpp" line="2143"/>
         <source>Suit:</source>
         <translation>Drakt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2139"/>
+        <location filename="../qt-ui/models.cpp" line="2145"/>
         <source>Viz:</source>
         <translation>Sikt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2141"/>
+        <location filename="../qt-ui/models.cpp" line="2147"/>
         <source>Rating:</source>
         <translation>Vurdering:</translation>
     </message>
@@ -4164,103 +4409,108 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="628"/>
         <source> (#%1 of %2)</source>
         <translation> (#%1 av %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="630"/>
+        <source>Unknown dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="647"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1168"/>
         <source>Make first divecomputer</source>
         <translation>Gjør til første dykkecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Delete this divecomputer</source>
         <translation>Slett denne dykkecomputeren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1184"/>
         <source>Add gas change</source>
         <translation>Legg til gassbytte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1187"/>
         <source> (Tank %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1195"/>
         <source>Add set-point change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1197"/>
         <source>Add bookmark</source>
         <translation>Legg til bokmerke</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
         <source>Remove event</source>
         <translation>Fjern hendelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1206"/>
         <source>Hide similar events</source>
         <translation>Skjul lignende hendelser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1213"/>
         <source>Edit name</source>
         <translation>Rediger navn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1242"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1249"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1264"/>
         <source>Unhide all events</source>
         <translation>Vis alle hendelser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide events</source>
         <translation>Skjul hendelser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide all %1 events?</source>
         <translation>Skjul alle %1 hendelser?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1333"/>
         <source>Remove the selected event?</source>
         <translation>Fjern den valgte hendelsen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1334"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1424"/>
         <source>Edit name of bookmark</source>
         <translation>Rediger navn på bokmerke</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
         <source>Custom name:</source>
         <translation>Tilpasset navn:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1430"/>
         <source>Name is too long!</source>
         <translation>Navnet er for langt</translation>
     </message>
@@ -4268,102 +4518,102 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>AIR</source>
         <translation>Luft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>OXYGEN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="208"/>
         <source>Remove this point</source>
         <translation>Fjern dette punktet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="57"/>
         <source>Close</source>
         <translation>Lukk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="42"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="25"/>
         <source>Average</source>
         <translation>Gjennomsnitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="45"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="28"/>
         <source>Minimum</source>
         <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="48"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="31"/>
         <source>Maximum</source>
         <translation>Maksimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="297"/>
+        <location filename="../qt-ui/globe.cpp" line="296"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>Finn sted i kartet og dobbeltklikk for å sette posisjon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="525"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="526"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="550"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="551"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="570"/>
+        <location filename="../qt-ui/models.cpp" line="574"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="571"/>
+        <location filename="../qt-ui/models.cpp" line="575"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="595"/>
+        <location filename="../qt-ui/models.cpp" line="599"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="596"/>
+        <location filename="../qt-ui/models.cpp" line="600"/>
         <source>cuft</source>
         <translation>ft³</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="513"/>
         <source>Invalid response from server</source>
         <translation>Ugyldig svar fra tjener</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation>Forventet XML-tag &apos;DiveDateReader&apos;, men fikk &apos;%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="567"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation>Fant ikke XML-tag &apos;DiveDates&apos; som forventet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Feil formattert XML-svar. Linje %1: %2</translation>
     </message>
@@ -4371,12 +4621,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1450"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1518"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1442"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -4390,12 +4640,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
-        <location filename="../qt-ui/simplewidgets.cpp" line="151"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="134"/>
         <source>New starting number</source>
         <translation>Nytt startnummer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="149"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="132"/>
         <source>New number</source>
         <translation>Nytt tall</translation>
     </message>
@@ -4403,12 +4653,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1575"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1653"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1579"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1657"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -4487,12 +4737,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Hvilket dato og tid vises på bildet?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="276"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="259"/>
         <source>Open image file</source>
         <translation>Åpne bilder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="278"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="261"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Bilder (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -4545,7 +4795,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <name>SocialNetworkDialog</name>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="282"/>
-        <source>Dive Date: %1 
+        <source>Dive date: %1 
 </source>
         <translation type="unfinished"/>
     </message>
@@ -4569,7 +4819,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="290"/>
-        <source>Dive Location: %1 
+        <source>Dive location: %1 
 </source>
         <translation type="unfinished"/>
     </message>
@@ -4686,47 +4936,47 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="329"/>
         <source>Webservice</source>
         <translation>Nettjeneste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="393"/>
         <source>Connecting...</source>
         <translation>Kobler til...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
         <source>Download finished</source>
         <translation>Nedlasting er ferdig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Download error: %1</source>
         <translation>Feil ved nedlasting: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="436"/>
         <source>Connection error: </source>
         <translation>Forbindelsesfeil:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
         <source>Download successful</source>
         <translation>Nedlasting ferdig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="439"/>
         <source>Invalid user identifier!</source>
         <translation>Ugyldig bruker-ID!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="312"/>
         <source>Enter User ID and click Download</source>
         <translation>Skriv inn bruker-ID og trykk Last ned</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="442"/>
         <source>Cannot parse response!</source>
         <translation>Kan ikke lese svar!</translation>
     </message>
@@ -4734,7 +4984,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="592"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="575"/>
         <source>Suits: </source>
         <translation type="unfinished"/>
     </message>
@@ -4742,7 +4992,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="119"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="116"/>
         <source>No suit set</source>
         <translation type="unfinished"/>
     </message>
@@ -4759,7 +5009,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="513"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="496"/>
         <source>Tags: </source>
         <translation type="unfinished"/>
     </message>
@@ -4767,7 +5017,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="144"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="141"/>
         <source>Empty tags</source>
         <translation type="unfinished"/>
     </message>
@@ -4775,17 +5025,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>Description</source>
         <translation>Beskrivelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -4793,7 +5043,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="141"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="131"/>
         <source>Information</source>
         <translation>Informasjon</translation>
     </message>
@@ -4801,7 +5051,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1090"/>
+        <location filename="../qt-ui/models.cpp" line="1094"/>
         <source> (%1 shown)</source>
         <translation type="unfinished"/>
     </message>
@@ -4809,72 +5059,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="64"/>
         <source>Check for updates.</source>
         <translation>Se etter oppdateringer.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="66"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface klarte ikke å se etter oppdateringer.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="70"/>
         <source>The following error occurred:</source>
         <translation>Den følgende feilen inntraff:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="72"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
         <source>Please check your internet connection.</source>
         <translation>Sjekk internettforbindelsen din.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="85"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="84"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="88"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="95"/>
         <source>A new version of Subsurface is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="97"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
         <source>Latest version is %1, please check with your OS vendor for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="103"/>
         <source>Newest release version is </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="105"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
         <source>The server returned the following information:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="121"/>
         <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
         <source>Decline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="124"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
         <source>Accept</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="126"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="125"/>
         <source>Automatic check for updates</source>
         <translation type="unfinished"/>
     </message>
@@ -4882,13 +5132,13 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UserManual</name>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="55"/>
+        <location filename="../qt-ui/usermanual.cpp" line="54"/>
         <source>User Manual</source>
         <translation>Brukermanual</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="72"/>
-        <location filename="../qt-ui/usermanual.cpp" line="78"/>
+        <location filename="../qt-ui/usermanual.cpp" line="71"/>
+        <location filename="../qt-ui/usermanual.cpp" line="77"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Finner ikke manualen</translation>
     </message>
@@ -4966,82 +5216,82 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
         <source>
 Operating System: %1</source>
         <translation>Operativsystem: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
         <source>
 CPU Architecture: %1</source>
         <translation>Prosessorarktitektur: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 Language: %1</source>
         <translation>Språk: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="93"/>
         <source>Should we ask you later?</source>
         <translation>Skal vi spørre deg igjen senere?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Don&apos;t ask me again</source>
         <translation>Ikke spør meg igjen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Ask later</source>
         <translation>Spør senere</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
         <source>Submit user survey.</source>
         <translation>Send inn brukerundersøkelse.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask again?</source>
         <translation>Spørre igjen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="17"/>
         <source>Send</source>
         <translation>Send</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>
 OS CPU-arkitektur: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation>Subsurface klarte ikke å sende inn undersøkelsen.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="121"/>
         <source>The following error occurred:</source>
         <translation>Den følgende feilen inntraff:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>Please check your internet connection.</source>
         <translation>Sjekk internettforbindelsen din.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="131"/>
         <source>Survey successfully submitted.</source>
         <translation>Undersøkelsen er sendt.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="136"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation>Det oppstod en feil under leting etter oppdatering.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -5049,12 +5299,12 @@ OS CPU-arkitektur: %1</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>Description</source>
         <translation>Beskrivelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -5102,12 +5352,12 @@ OS CPU-arkitektur: %1</translation>
         <translation>Last opp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="247"/>
         <source>Operation timed out</source>
         <translation>Handlingen fikk tidsavbrudd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="268"/>
         <source>Transferring data...</source>
         <translation type="unfinished"/>
     </message>
@@ -5115,17 +5365,17 @@ OS CPU-arkitektur: %1</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Weight</source>
         <translation>Vekt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="496"/>
+        <location filename="../qt-ui/models.cpp" line="500"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Klikk her for å fjerne dette vektsystemet.</translation>
     </message>
@@ -5133,19 +5383,19 @@ OS CPU-arkitektur: %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1479"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1487"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1497"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1555"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1566"/>
         <source>Failed!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1506"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1576"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1580"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -5153,79 +5403,79 @@ OS CPU-arkitektur: %1</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1841"/>
+        <location filename="../qt-ui/models.cpp" line="1847"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>År
 &gt; Måned / Tur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1844"/>
+        <location filename="../qt-ui/models.cpp" line="1850"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1847"/>
+        <location filename="../qt-ui/models.cpp" line="1853"/>
         <source>Duration 
  Total</source>
         <translation>Varighet
 Total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1850"/>
+        <location filename="../qt-ui/models.cpp" line="1856"/>
         <source>
 Average</source>
         <translation>
 Snitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1853"/>
+        <location filename="../qt-ui/models.cpp" line="1859"/>
         <source>
 Shortest</source>
         <translation>
 Kortest</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1856"/>
+        <location filename="../qt-ui/models.cpp" line="1862"/>
         <source>
 Longest</source>
         <translation>
 Lengst</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1859"/>
+        <location filename="../qt-ui/models.cpp" line="1865"/>
         <source>Depth (%1)
  Average</source>
         <translation>Dybde (%1)
 Snitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1862"/>
-        <location filename="../qt-ui/models.cpp" line="1871"/>
-        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>
 Minimum</source>
         <translation>
 Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1865"/>
-        <location filename="../qt-ui/models.cpp" line="1874"/>
-        <location filename="../qt-ui/models.cpp" line="1883"/>
+        <location filename="../qt-ui/models.cpp" line="1871"/>
+        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>
 Maximum</source>
         <translation>
 Maksimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1874"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Snitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1883"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -5306,40 +5556,40 @@ Snitt</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1508"/>
+        <location filename="../dive.c" line="1530"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) eller (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="464"/>
+        <location filename="../divelist.c" line="467"/>
         <location filename="../equipment.c" line="81"/>
-        <location filename="../planner.c" line="1060"/>
-        <location filename="../planner.c" line="1063"/>
+        <location filename="../planner.c" line="1081"/>
+        <location filename="../planner.c" line="1084"/>
         <source>air</source>
         <translation>luft</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="192"/>
+        <location filename="../equipment.c" line="194"/>
         <source>integrated</source>
         <translation>integrert bly</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="193"/>
+        <location filename="../equipment.c" line="195"/>
         <source>belt</source>
         <translation>vektbelte</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="194"/>
+        <location filename="../equipment.c" line="196"/>
         <source>ankle</source>
         <translation>ankelvekt</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="195"/>
+        <location filename="../equipment.c" line="197"/>
         <source>backplate weight</source>
         <translation>p-vekt</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="196"/>
+        <location filename="../equipment.c" line="198"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -5347,7 +5597,7 @@ Snitt</translation>
         <location filename="../file.c" line="112"/>
         <location filename="../file.c" line="434"/>
         <location filename="../file.c" line="506"/>
-        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="925"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Kunne ikke åpne &apos;%s&apos;</translation>
     </message>
@@ -5404,9 +5654,9 @@ Snitt</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../file.c" line="869"/>
-        <location filename="../file.c" line="909"/>
-        <location filename="../file.c" line="1007"/>
+        <location filename="../file.c" line="870"/>
+        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="1016"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>Maks antall kolonner i CSV-importen er %d</translation>
     </message>
@@ -5577,27 +5827,27 @@ Snitt</translation>
         <translation>ugyldig hendelsesnummer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="421"/>
+        <location filename="../libdivecomputer.c" line="419"/>
         <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="427"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Error registering the data</source>
         <translation>Feil ved registrering av data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="433"/>
         <source>Error parsing the datetime</source>
         <translation>Feil ved lesing av dato</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Dive %d: %s</source>
         <translation>Dykk %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="455"/>
+        <location filename="../libdivecomputer.c" line="454"/>
         <source>Error parsing the divetime</source>
         <translation>Feil ved lesing av dykketid</translation>
     </message>
@@ -5607,156 +5857,156 @@ Snitt</translation>
         <translation>Feil ved lesing av maksdybde</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="482"/>
+        <location filename="../libdivecomputer.c" line="483"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="501"/>
+        <location filename="../libdivecomputer.c" line="503"/>
         <source>Error parsing the gas mix count</source>
         <translation>Feil ved lesing av gassmiksantall</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="513"/>
+        <location filename="../libdivecomputer.c" line="515"/>
         <source>Error obtaining water salinity</source>
         <translation>Feil ved lesing av salthetsgrad</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="521"/>
+        <location filename="../libdivecomputer.c" line="524"/>
         <source>Error obtaining surface pressure</source>
         <translation>Klarte ikke å hente overflatetrykk</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="545"/>
+        <location filename="../libdivecomputer.c" line="549"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="562"/>
+        <location filename="../libdivecomputer.c" line="569"/>
         <source>Error parsing the gas mix</source>
         <translation>Feil ved lesing av gassmiks</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="569"/>
+        <location filename="../libdivecomputer.c" line="576"/>
         <source>Error parsing the samples</source>
         <translation>Feil ved lesing av detaljer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="706"/>
+        <location filename="../libdivecomputer.c" line="713"/>
         <source>Event: waiting for user action</source>
         <translation>Hendelse: Venter på bruker</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="714"/>
+        <location filename="../libdivecomputer.c" line="721"/>
         <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="778"/>
+        <location filename="../libdivecomputer.c" line="785"/>
         <source>Error registering the event handler.</source>
         <translation>Feil ved registrering av hendelseshåndterer.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="783"/>
+        <location filename="../libdivecomputer.c" line="790"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Feil ved registrering av avbruddshåndterer.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="804"/>
+        <location filename="../libdivecomputer.c" line="811"/>
         <source>Dive data import error</source>
         <translation>Feil ved import av dykkedata</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="843"/>
+        <location filename="../libdivecomputer.c" line="850"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Kunne ikke opprette kontekst for libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="850"/>
+        <location filename="../libdivecomputer.c" line="857"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Fikk ikke åpnet %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="858"/>
+        <location filename="../libdivecomputer.c" line="865"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="506"/>
+        <location filename="../parse-xml.c" line="516"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Rar lesing av prosent %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1760"/>
+        <location filename="../parse-xml.c" line="1770"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Kunne ikke lese &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1989"/>
-        <location filename="../parse-xml.c" line="2137"/>
+        <location filename="../parse-xml.c" line="1999"/>
+        <location filename="../parse-xml.c" line="2147"/>
         <source>Database query dm4_events failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1996"/>
-        <location filename="../parse-xml.c" line="2144"/>
+        <location filename="../parse-xml.c" line="2006"/>
+        <location filename="../parse-xml.c" line="2154"/>
         <source>Database query dm4_tags failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2318"/>
+        <location filename="../parse-xml.c" line="2328"/>
         <source>Database query shearwater_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2325"/>
+        <location filename="../parse-xml.c" line="2335"/>
         <source>Database query shearwater_changes failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2332"/>
+        <location filename="../parse-xml.c" line="2342"/>
         <source>Database query shearwater_profile_sample failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2451"/>
+        <location filename="../parse-xml.c" line="2461"/>
         <source>Database query cobalt_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2458"/>
+        <location filename="../parse-xml.c" line="2468"/>
         <source>Database query cobalt_buddies failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2465"/>
+        <location filename="../parse-xml.c" line="2475"/>
         <source>Database query cobalt_visibility failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2472"/>
+        <location filename="../parse-xml.c" line="2482"/>
         <source>Database query cobalt_location failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2479"/>
+        <location filename="../parse-xml.c" line="2489"/>
         <source>Database query cobalt_location (site) failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2486"/>
+        <location filename="../parse-xml.c" line="2496"/>
         <source>Database query cobalt_profile_sample failed.
 </source>
         <translation type="unfinished"/>
@@ -5769,17 +6019,17 @@ Snitt</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2168"/>
-        <location filename="../parse-xml.c" line="2189"/>
-        <location filename="../parse-xml.c" line="2508"/>
-        <location filename="../parse-xml.c" line="2527"/>
+        <location filename="../parse-xml.c" line="2178"/>
+        <location filename="../parse-xml.c" line="2199"/>
+        <location filename="../parse-xml.c" line="2518"/>
+        <location filename="../parse-xml.c" line="2537"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Databasespørring feilet &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2848"/>
+        <location filename="../parse-xml.c" line="2909"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Kan ikke åpne stilark %s</translation>
     </message>
@@ -5789,161 +6039,167 @@ Snitt</translation>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="820"/>
+        <location filename="../planner.c" line="841"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Finner ikke gassen %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="356"/>
+        <location filename="../planner.c" line="363"/>
         <source>Too many gas mixes</source>
         <translation>For mange gassmikser</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="540"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation>Kalkulering av dekompresjon tok for lang tid, og er avbrutt</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="548"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation>basert på GFlow = %d og GFhigh = %d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="544"/>
+        <location filename="../planner.c" line="551"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface dykkeplan</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="548"/>
+        <location filename="../planner.c" line="555"/>
         <source>depth</source>
         <translation>dybde</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="558"/>
         <source>runtime</source>
         <translation>løpetid</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="554"/>
+        <location filename="../planner.c" line="561"/>
         <source>duration</source>
         <translation>lengde</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="557"/>
+        <location filename="../planner.c" line="564"/>
         <source>gas</source>
         <translation>gass</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="594"/>
+        <location filename="../planner.c" line="601"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="602"/>
+        <location filename="../planner.c" line="609"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Overgang til %.*f %s på %d:%02d min - løpetid %d:%02u på %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="615"/>
+        <location filename="../planner.c" line="622"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="622"/>
+        <location filename="../planner.c" line="629"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Bli ved %.*f %s i %d:%02d min - løpetid %d:%02u i %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="635"/>
+        <location filename="../planner.c" line="642"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="638"/>
-        <location filename="../planner.c" line="642"/>
+        <location filename="../planner.c" line="645"/>
+        <location filename="../planner.c" line="649"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="651"/>
+        <location filename="../planner.c" line="658"/>
         <source>(SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="676"/>
+        <location filename="../planner.c" line="683"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="678"/>
+        <location filename="../planner.c" line="685"/>
         <source>Switch gas to %s</source>
         <translation>Bytt til gass %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="697"/>
+        <location filename="../planner.c" line="704"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="699"/>
+        <location filename="../planner.c" line="706"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="710"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="705"/>
+        <location filename="../planner.c" line="712"/>
         <source>Gas consumption:</source>
         <translation>Gassforbruk:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="535"/>
-        <location filename="../planner.c" line="725"/>
-        <location filename="../planner.c" line="730"/>
-        <location filename="../planner.c" line="753"/>
+        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="732"/>
+        <location filename="../planner.c" line="737"/>
+        <location filename="../planner.c" line="762"/>
+        <location filename="../planner.c" line="772"/>
         <source>Warning:</source>
         <translation>Advarsel:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="523"/>
+        <location filename="../planner.c" line="530"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="726"/>
+        <location filename="../planner.c" line="733"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>dette er mer gass en det som er tilgjengelig i tanken!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="731"/>
+        <location filename="../planner.c" line="738"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>ikke nok i reserve til å dele gass under oppstigning!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="733"/>
+        <location filename="../planner.c" line="740"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s av %s (%.0f%s/%.0f%s i planlagt oppstigning)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="735"/>
+        <location filename="../planner.c" line="742"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s under planlagt oppstigning) av %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="759"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>høy pO₂-verdi %.2f ve %d:%02u med gass %s ved dybde %.*f %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="1064"/>
+        <location filename="../planner.c" line="769"/>
+        <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="1085"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1099"/>
+        <location filename="../profile.c" line="1113"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -5952,70 +6208,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1102"/>
+        <location filename="../profile.c" line="1116"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1106"/>
+        <location filename="../profile.c" line="1120"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1112"/>
+        <location filename="../profile.c" line="1126"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1115"/>
+        <location filename="../profile.c" line="1129"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1117"/>
+        <location filename="../profile.c" line="1131"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1119"/>
+        <location filename="../profile.c" line="1133"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1121"/>
+        <location filename="../profile.c" line="1135"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1123"/>
+        <location filename="../profile.c" line="1137"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1140"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1147"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -6024,7 +6280,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1137"/>
+        <location filename="../profile.c" line="1151"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -6033,148 +6289,148 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1149"/>
+        <location filename="../profile.c" line="1163"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Sikkerhetsstopp: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1152"/>
+        <location filename="../profile.c" line="1166"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Sikkerhetsstopp: ukjent tid @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1157"/>
+        <location filename="../profile.c" line="1171"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1174"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deko: ukjent tid @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1178"/>
         <source>In deco
 </source>
         <translation>I deko
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1166"/>
+        <location filename="../profile.c" line="1180"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1183"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1172"/>
+        <location filename="../profile.c" line="1186"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (kalk.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1180"/>
+        <location filename="../profile.c" line="1194"/>
         <source>In deco (calc)
 </source>
         <translation>I deko (kalk.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1196"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (kalk.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1185"/>
+        <location filename="../profile.c" line="1199"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (kalk.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1188"/>
+        <location filename="../profile.c" line="1202"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Kalkulert tak %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1194"/>
+        <location filename="../profile.c" line="1208"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Vev %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1214"/>
         <source>heartbeat: %d
 </source>
         <translation>puls: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1202"/>
+        <location filename="../profile.c" line="1216"/>
         <source>bearing: %d
 </source>
         <translation>retning: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1205"/>
+        <location filename="../profile.c" line="1219"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1314"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1304"/>
-        <location filename="../profile.c" line="1308"/>
-        <location filename="../profile.c" line="1312"/>
+        <location filename="../profile.c" line="1318"/>
+        <location filename="../profile.c" line="1322"/>
+        <location filename="../profile.c" line="1326"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1316"/>
+        <location filename="../profile.c" line="1330"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1334"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1324"/>
-        <location filename="../profile.c" line="1328"/>
+        <location filename="../profile.c" line="1338"/>
+        <location filename="../profile.c" line="1342"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1335"/>
+        <location filename="../profile.c" line="1349"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -6305,6 +6561,7 @@ EADD: %d%s
     </message>
     <message>
         <location filename="../dive.c" line="30"/>
+        <location filename="../equipment.c" line="85"/>
         <source>oxygen</source>
         <translation type="unfinished"/>
     </message>
@@ -6359,97 +6616,97 @@ EADD: %d%s
         <translation>(ingen dykk)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sun</source>
         <translation>søn</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Mon</source>
         <translation>man</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Tue</source>
         <translation>tir</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Wed</source>
         <translation>ons</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Thu</source>
         <translation>tor</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Fri</source>
         <translation>fre</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sat</source>
         <translation>lør</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jan</source>
         <translation>jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Feb</source>
         <translation>feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Mar</source>
         <translation>mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Apr</source>
         <translation>apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>May</source>
         <translation>mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jun</source>
         <translation>jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Jul</source>
         <translation>jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Aug</source>
         <translation>aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Sep</source>
         <translation>sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Oct</source>
         <translation>okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Nov</source>
         <translation>nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Dec</source>
         <translation>des</translation>
     </message>
@@ -7053,13 +7310,13 @@ Er Uemis Zurich plugget i ordentlig?</translation>
         <translation>Planlegging</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
         <source>GF low</source>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>%</source>
         <translation>%</translation>
     </message>
@@ -7069,7 +7326,7 @@ Er Uemis Zurich plugget i ordentlig?</translation>
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="335"/>
         <source>Drop to first depth</source>
         <translation>Dropp til første dybde</translation>
     </message>
@@ -7079,69 +7336,69 @@ Er Uemis Zurich plugget i ordentlig?</translation>
         <translation>Siste stopp ved 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
         <source>Plan backgas breaks</source>
         <translation>Planlegg stopp med bakgass</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="355"/>
         <source>Gas options</source>
         <translation>Gassvalg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="376"/>
         <source>Bottom SAC</source>
         <translation>SAC på bunn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="383"/>
         <source>Deco SAC</source>
         <translation>SAC under deko</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="380"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="390"/>
         <source>Bottom pO₂</source>
         <translation>pO₂ på bunn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="403"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="413"/>
         <source>Deco pO₂</source>
         <translation>pO₂ for deko</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="449"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="462"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="478"/>
         <source>Dive notes</source>
         <translation>Notater</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
         <source>Display runtime</source>
         <translation>Vis løpetid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <source>Display segment duration</source>
         <translation>Vis lengde på segment</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="531"/>
         <source>Display transitions in deco</source>
         <translation>Vis overganger i deko</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="538"/>
         <source>Verbatim dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="387"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="410"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="397"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -7161,17 +7418,17 @@ Er Uemis Zurich plugget i ordentlig?</translation>
         <translation>6m til overflaten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="499"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>I dykkeplanen, vis stoppenes løpetid (absolutt tid)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="515"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>I dykkeplanen, vis stoppenes lengde (relativ tid)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>I dykkeplanen, vis overganger eller behandle dem eksplisitt</translation>
     </message>
diff --git a/translations/subsurface_nl_NL.ts b/translations/subsurface_nl_NL.ts
index cdc883806..5cb3103b9 100644
--- a/translations/subsurface_nl_NL.ts
+++ b/translations/subsurface_nl_NL.ts
@@ -3,12 +3,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="539"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="522"/>
         <source>Person: </source>
         <translation>Persoon:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="540"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="523"/>
         <source>Searches for buddies and divemasters</source>
         <translation>zoekt naar buddies en divemasters</translation>
     </message>
@@ -16,40 +16,188 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="233"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="230"/>
         <source>No buddies</source>
         <translation>Geen buddies</translation>
     </message>
 </context>
 <context>
+    <name>ColumnNameProvider</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>GPS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Avg depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="210"/>
+        <location filename="../configuredivecomputer.cpp" line="212"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation>Kan het backup bestand %1 niet bewaren. Foutmelding: %2</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="226"/>
+        <location filename="../configuredivecomputer.cpp" line="228"/>
         <source>Could not open backup file: %1</source>
         <translation>Kan het backup bestand niet openen: %1</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="542"/>
+        <location filename="../configuredivecomputer.cpp" line="552"/>
         <source>Dive computer details read successfully</source>
         <translation>Details duikcomputer opgehaald.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="551"/>
+        <location filename="../configuredivecomputer.cpp" line="561"/>
         <source>Setting successfully written to device</source>
         <translation>Instelling bewaard op het toestel</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="560"/>
+        <location filename="../configuredivecomputer.cpp" line="570"/>
         <source>Device firmware successfully updated</source>
         <translation>Firmware bijgewerkt</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="569"/>
+        <location filename="../configuredivecomputer.cpp" line="579"/>
         <source>Device settings successfully reset</source>
         <translation>Instellingen van het toestel teruggesteld</translation>
     </message>
@@ -847,72 +995,72 @@
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1053"/>
         <source>Backup files (*.xml)</source>
         <translation>Backup bestanden (*.xml)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1037"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>Fout tijdens het opslaan van het backup bestand
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1040"/>
         <source>Backup succeeded</source>
         <translation>Backup geslaagd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1041"/>
         <source>Your settings have been saved to: %1</source>
         <translation>Uw instellingen zijn bewaard in: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1030"/>
         <source>Backup dive computer settings</source>
         <translation>Backup duikcomputer instellingen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1036"/>
         <source>XML backup error</source>
         <translation>Fout in XML backup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1052"/>
         <source>Restore dive computer settings</source>
         <translation>Instellingen duikcomputer herstellen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1056"/>
         <source>XML restore error</source>
         <translation>Fout bij het herstellen van XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1057"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>Fout tijdens het herstellen van het backup bestand.
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1063"/>
         <source>Restore succeeded</source>
         <translation>Herstelling geslaagd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1064"/>
         <source>Your settings have been restored successfully.</source>
         <translation>Uw instellingen zijn hersteld.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1074"/>
         <source>Select firmware file</source>
         <translation>Firmware bestand selecteren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1075"/>
         <source>All files (*.*)</source>
         <translation>Alle bestanden (*.*)</translation>
     </message>
@@ -970,12 +1118,12 @@
         <translation>Klik hier om de fles te verwijderen.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="410"/>
         <source>Cylinder cannot be removed</source>
         <translation>Fles kan niet verwijderd worden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="407"/>
+        <location filename="../qt-ui/models.cpp" line="411"/>
         <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>
@@ -1051,12 +1199,12 @@
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="48"/>
         <source>Remove the selected dive computer?</source>
         <translation>Geselecteerde duikcomputer verwijderen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="49"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
         <translation>Bent u zeker dat u de geselecteerde
@@ -1071,22 +1219,22 @@ duikcomputer wilt verwijderen?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Model</source>
         <translation>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Device ID</source>
         <translation>Toestel ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Nickname</source>
         <translation>Apparaatnaam</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Klik hier om deze duikcomputer te verwijderen.</translation>
     </message>
@@ -1094,117 +1242,145 @@ duikcomputer wilt verwijderen?</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="115"/>
         <source>Bailing out to OC</source>
         <translation>Schakel om naar OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="117"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> begin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> eind</translation>
     </message>
 </context>
 <context>
+    <name>DiveImportedModel</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="556"/>
+        <source>Date/time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
+        <source>Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>h:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>min</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1242"/>
+        <location filename="../qt-ui/models.cpp" line="1248"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1245"/>
+        <location filename="../qt-ui/models.cpp" line="1251"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1248"/>
+        <location filename="../qt-ui/models.cpp" line="1254"/>
         <source>Rating</source>
         <translation>Waardering</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Depth(%1)</source>
         <translation>Diepte (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1254"/>
+        <location filename="../qt-ui/models.cpp" line="1260"/>
         <source>Duration</source>
         <translation>Duur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1263"/>
         <source>Temp(%1%2)</source>
         <translation>Temp (%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>Weight(%1)</source>
         <translation>Gewicht (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>lbs</source>
         <translation>US pond</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1263"/>
+        <location filename="../qt-ui/models.cpp" line="1269"/>
         <source>Suit</source>
         <translation>Pak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1266"/>
+        <location filename="../qt-ui/models.cpp" line="1272"/>
         <source>Cyl</source>
         <translation>Fles</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1269"/>
+        <location filename="../qt-ui/models.cpp" line="1275"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>SAC(%1)</source>
         <translation>Gasverbruik (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1277"/>
+        <location filename="../qt-ui/models.cpp" line="1283"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1280"/>
+        <location filename="../qt-ui/models.cpp" line="1286"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1283"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>Location</source>
         <translation>Locatie</translation>
     </message>
@@ -1212,87 +1388,87 @@ duikcomputer wilt verwijderen?</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="787"/>
+        <location filename="../qt-ui/divelistview.cpp" line="768"/>
         <source>Expand all</source>
         <translation>Alles uitklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="788"/>
+        <location filename="../qt-ui/divelistview.cpp" line="769"/>
         <source>Collapse all</source>
         <translation>Alles inklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="789"/>
+        <location filename="../qt-ui/divelistview.cpp" line="770"/>
         <source>Collapse others</source>
         <translation>andere samenklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="791"/>
+        <location filename="../qt-ui/divelistview.cpp" line="772"/>
         <source>Remove dive(s) from trip</source>
         <translation>duik(en) uit trip verwijderen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="792"/>
+        <location filename="../qt-ui/divelistview.cpp" line="773"/>
         <source>Create new trip above</source>
         <translation>Nieuwe trip hierboven invoegen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="806"/>
+        <location filename="../qt-ui/divelistview.cpp" line="787"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>duik(en) toevoegen aan de trip hierboven</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="808"/>
+        <location filename="../qt-ui/divelistview.cpp" line="789"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Voeg duik(en) toe aan de trip hieronder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="812"/>
+        <location filename="../qt-ui/divelistview.cpp" line="793"/>
         <source>Merge trip with trip above</source>
         <translation>Trip met bovenstaande samenvoegen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="813"/>
+        <location filename="../qt-ui/divelistview.cpp" line="794"/>
         <source>Merge trip with trip below</source>
         <translation>Trip met onderstaande samenvoegen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="817"/>
+        <location filename="../qt-ui/divelistview.cpp" line="798"/>
         <source>Delete dive(s)</source>
         <translation>duik(en) verwijderen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="819"/>
+        <location filename="../qt-ui/divelistview.cpp" line="800"/>
         <source>Mark dive(s) invalid</source>
         <translation>markeer duik(en) als ongeldig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="823"/>
+        <location filename="../qt-ui/divelistview.cpp" line="804"/>
         <source>Merge selected dives</source>
         <translation>geselecteerde duiken samenvoegen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="825"/>
+        <location filename="../qt-ui/divelistview.cpp" line="806"/>
         <source>Renumber dive(s)</source>
         <translation>Duik(en) opnieuw nummeren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="826"/>
+        <location filename="../qt-ui/divelistview.cpp" line="807"/>
         <source>Shift times</source>
         <translation>tijdstippen verschuiven</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="827"/>
+        <location filename="../qt-ui/divelistview.cpp" line="808"/>
         <source>Load images</source>
         <translation>afbeeldingen laden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Open image files</source>
         <translation>Afbeelding openen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Afbeeldingen (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -1477,100 +1653,100 @@ duikcomputer wilt verwijderen?</translation>
         <translation>Zandkleurig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF bestanden (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="268"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>CSV bestanden (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="68"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Algemene bestandsindeling die gebruikt wordt om gegevens uit te wisselen tussen verschillende duik programma&apos;s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>Waarden gescheiden door komma&apos;s die het duikprofiel beschrijven</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation>Waarden gescheiden komma&apos;s met duikinformatie. Deze omvatten een groot deel van de informatie, uitgezonderd het duikprofiel.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Zend de duikgegevens naar de divelogs.de website.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>Verzend duikgegevens naar dive-share.appspot.com</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>HTML export van duiklocaties op een wereldkaart.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurface XML bestandsindeling.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
         <source>Write depths of images to file.</source>
         <translation>Voeg dieptes waarop foto&apos;s genomen zijn toe aan het bestand.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export UDDF file as</source>
         <translation>Exporteer UDDF bestand als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="267"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
         <source>Export CSV file as</source>
         <translation>Exporteer CSV bestand als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="278"/>
         <source>Export world map</source>
         <translation>Wereldkaart exporteren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="299"/>
         <source>HTML files (*.html)</source>
         <translation>HTML bestanden (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="283"/>
         <source>Export Subsurface XML</source>
         <translation>Exporteer Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="284"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML bestanden (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
         <source>Save image depths</source>
         <translation>Bewaar dieptes waarop de foto&apos;s genomen zijn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="298"/>
         <source>Export HTML files as</source>
         <translation>Exporteer HTML bestanden als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
         <source>Can&apos;t open file %s</source>
         <translation>Kan het bestand %s niet openen</translation>
     </message>
@@ -1583,248 +1759,228 @@ duikcomputer wilt verwijderen?</translation>
         <translation>Duiklogboek importeren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
-        <source>CSV options</source>
-        <translation>CSV opties</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="281"/>
-        <source>Pre-configured imports</source>
-        <translation>Vooraf ingestelde import</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="122"/>
-        <source>Depth</source>
-        <translation>Diepte</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="142"/>
-        <source>Stopdepth</source>
-        <translation>Stop diepte</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="162"/>
-        <source>Pressure</source>
-        <translation>Druk</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="176"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="466"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
         <source>Time</source>
         <translation>Tijd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="183"/>
-        <source>Temp</source>
-        <translation>Temperatuur</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="213"/>
-        <source>NDL</source>
-        <translation>NDL</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="233"/>
-        <source>TTS</source>
-        <translation>TTS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="253"/>
-        <source>Cns</source>
-        <translation>Cns</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="58"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="789"/>
-        <source>Field separator</source>
-        <translation>Scheiding tussen velden</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="35"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="363"/>
-        <source>Units</source>
-        <translation>Eenheden</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="42"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="370"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="97"/>
         <source>Metric</source>
         <translation>Metrisch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="47"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="375"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="102"/>
         <source>Imperial</source>
         <translation>Imperiaal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="169"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="298"/>
-        <source>Manual dives</source>
-        <translation>Handmatige duiken</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="316"/>
-        <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source>
-        <translation>Kies volgorde van dag, maand en jaar voor het datumformaat. De velden kunnen gescheiden worden door .-/.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="319"/>
-        <source>Date format</source>
-        <translation>Datumformaat:</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="332"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="59"/>
         <source>dd.mm.yyyy</source>
         <translation>dd.mm.jjjj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="337"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="64"/>
         <source>mm/dd/yyyy</source>
         <translation>mm/dd/jjjj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="342"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="69"/>
         <source>yyyy-mm-dd</source>
         <translation>jjjj-mm-dd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="392"/>
-        <source>Dive #</source>
-        <translation>Duik #</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="426"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="439"/>
-        <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source>
-        <translation>Datum in dd.mm.jjjj, jjjj-mm-dd of mm/dd/jjjj formaat</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+        <source>Dive #</source>
+        <translation>Duik #</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="429"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="500"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="513"/>
-        <source>Dive duration in seconds or in min:sec format</source>
-        <translation>Duikduur in seconden of min:sec formaat</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="503"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
         <source>Duration</source>
         <translation>Duur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="574"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="591"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
         <source>Tags</source>
         <translation>Trefwoorden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="608"/>
-        <source>Cyl size</source>
-        <translation>Formaat fles</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="625"/>
-        <source>Air temp</source>
-        <translation>Lucht temp</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="642"/>
-        <source>Start Pressure</source>
-        <translation>Startdruk</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="659"/>
-        <source>Water temp</source>
-        <translation>Water temp</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="676"/>
-        <source>End Press</source>
-        <translation>Einddruk</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="693"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
         <source>O₂</source>
         <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="710"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
         <source>He</source>
         <translation>He</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="742"/>
-        <source>Choose duration format.</source>
-        <translation>Selecteer tijdsduur formaat</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="745"/>
-        <source>Duration format</source>
-        <translation>Tijdsduur formaat</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="758"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="78"/>
         <source>Seconds</source>
         <translation>Seconden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="763"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
         <source>Minutes</source>
         <translation>Minuten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="768"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="88"/>
         <source>Minutes:seconds</source>
         <translation>Minuten:seconden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="540"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
         <source>Location</source>
         <translation>Locatie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="409"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
         <source>Max depth</source>
         <translation>Max diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="386"/>
-        <source>Field configuration</source>
-        <translation>Veld Configuratie</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+        <source>Tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+        <source>Samples pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
         <source>Mean depth</source>
         <translation>Gemiddelde diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="483"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="523"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
         <source>Notes</source>
         <translation>Notities</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="557"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DivePlanner</name>
@@ -1867,42 +2023,42 @@ duikcomputer wilt verwijderen?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
         <source>unknown</source>
         <translation>onbekend</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="691"/>
         <source>Final depth</source>
         <translation>Eind diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="693"/>
         <source>Run time</source>
         <translation>Run time</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="701"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="695"/>
         <source>Duration</source>
         <translation>Duur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="703"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
         <source>Used gas</source>
         <translation>Verbruikt Gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="705"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
         <source>CC set point</source>
         <translation>CC Instelpunt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1044"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1051"/>
         <source>Discard the plan?</source>
         <translation>Plan verwijderen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1045"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1052"/>
         <source>You are about to discard your plan.</source>
         <translation>U staat op het punt het plan te verwijderen</translation>
     </message>
@@ -1910,22 +2066,22 @@ duikcomputer wilt verwijderen?</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="257"/>
         <source>Dive planner points</source>
         <translation>Duikplanner punten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="261"/>
         <source>Available gases</source>
         <translation>Beschikbare gasmengsels</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="284"/>
         <source>Add dive data point</source>
         <translation>Duik punt toevoegen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="304"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="293"/>
         <source>Save new</source>
         <translation>Bewaar als nieuw bestand</translation>
     </message>
@@ -1933,92 +2089,112 @@ duikcomputer wilt verwijderen?</translation>
 <context>
     <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Depth</source>
         <translation>Diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
         <source>Time</source>
         <translation>Tijd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
         <source>Pressure</source>
         <translation>Druk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>Temperature</source>
         <translation>Temperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
         <source>Color</source>
         <translation>Kleur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
         <source>Pressure S</source>
         <translation>Druk S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
+        <source>Setpoint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
+        <source>Sensor1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
+        <source>Sensor2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
+        <source>Sensor3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
         <source>Ambient pressure</source>
         <translation>Omgevingsdruk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
-        <source>Heart Beat</source>
-        <translation>Hartslag</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
+        <source>Heart beat</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
-        <source>Gradient Factor</source>
-        <translation>Gradiënt Factor</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/>
+        <source>Gradient factor</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
-        <source>Mean Depth/s</source>
-        <translation>Gemiddelde Diepte/s</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
+        <source>Mean depth/s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
         <source>Pressure I</source>
         <translation>Druk I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
         <source>User entered</source>
         <translation>Ingevoerd door gebruiker</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
         <source>Cylinder index</source>
         <translation>Fles index</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
         <source>Ceiling</source>
         <translation>Plafond</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
         <source>SAC</source>
         <translation>Gasverbruik</translation>
     </message>
@@ -2069,127 +2245,127 @@ duikcomputer wilt verwijderen?</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1437"/>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1443"/>
+        <location filename="../qt-ui/models.cpp" line="1489"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1440"/>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1492"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1443"/>
-        <location filename="../qt-ui/models.cpp" line="1489"/>
+        <location filename="../qt-ui/models.cpp" line="1449"/>
+        <location filename="../qt-ui/models.cpp" line="1495"/>
         <source>Rating</source>
         <translation>Waardering</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1452"/>
         <source>Depth</source>
         <translation>Diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1458"/>
         <source>Temp</source>
         <translation>Temperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1461"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>SAC</source>
         <translation>Gasverbruik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>Weight(%1)</source>
         <translation>Gewicht (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1458"/>
-        <location filename="../qt-ui/models.cpp" line="1504"/>
+        <location filename="../qt-ui/models.cpp" line="1464"/>
+        <location filename="../qt-ui/models.cpp" line="1510"/>
         <source>Suit</source>
         <translation>Pak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1461"/>
-        <location filename="../qt-ui/models.cpp" line="1507"/>
+        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1513"/>
         <source>Cyl</source>
         <translation>Fles</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1464"/>
-        <location filename="../qt-ui/models.cpp" line="1510"/>
+        <location filename="../qt-ui/models.cpp" line="1470"/>
+        <location filename="../qt-ui/models.cpp" line="1516"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>SAC(%1)</source>
         <translation>Gasverbruik (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1473"/>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1527"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
-        <location filename="../qt-ui/models.cpp" line="1524"/>
+        <location filename="../qt-ui/models.cpp" line="1482"/>
+        <location filename="../qt-ui/models.cpp" line="1530"/>
         <source>Location</source>
         <translation>Locatie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>Depth(%1)</source>
         <translation>Diepte (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1449"/>
-        <location filename="../qt-ui/models.cpp" line="1495"/>
+        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1501"/>
         <source>Duration</source>
         <translation>Duur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1498"/>
+        <location filename="../qt-ui/models.cpp" line="1504"/>
         <source>Temp(%1%2)</source>
         <translation>Temp (%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>lbs</source>
         <translation>US pond</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1470"/>
-        <location filename="../qt-ui/models.cpp" line="1518"/>
+        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1524"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -2197,95 +2373,95 @@ duikcomputer wilt verwijderen?</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="98"/>
         <source>no dives were selected</source>
         <translation>geen duiken geselecteerd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="117"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>kan zip bestand voor opladen niet aanmaken: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="143"/>
         <source>cannot create temporary file: %s</source>
         <translation>kan tijdelijk bestand niet aanmaken: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/>
         <source>internal error: %s</source>
         <translation>interne fout: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="169"/>
         <source>internal error</source>
         <translation>interne fout</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="629"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="828"/>
         <source>Done</source>
         <translation>Klaar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/>
         <source>Uploading dive list...</source>
         <translation>Duiklijst wordt opgeladen...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="692"/>
         <source>Downloading dive list...</source>
         <translation>Duiklijst wordt geladen...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="741"/>
         <source>Downloading %1 dives...</source>
         <translation>%1 duiken worden geladen...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="785"/>
         <source>Download finished - %1</source>
         <translation>Download klaar - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="802"/>
         <source>Corrupted download</source>
         <translation>Beschadigde download</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Het archief kon niet geopend worden:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
         <source>Upload failed</source>
         <translation>Opladen mislukt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/>
         <source>Upload successful</source>
         <translation>Opladen gelukt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
         <source>Login failed</source>
         <translation>Login mislukt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
         <source>Cannot parse response</source>
         <translation>Kan antwoord niet correct ontleden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
         <source>Error: %1</source>
         <translation>Fout: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="829"/>
         <source>Upload finished</source>
         <translation>Opladen klaar</translation>
     </message>
@@ -2293,54 +2469,52 @@ duikcomputer wilt verwijderen?</translation>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="169"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="400"/>
         <source>Retry</source>
         <translation>Opnieuw</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="264"/>
         <source>Find Uemis dive computer</source>
         <translation>Uemis duikcomputer zoeken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Kies een bestand om duikcomputer log te downloaden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Log files (*.log)</source>
         <translation>Log bestanden (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="362"/>
         <source>Warning</source>
         <translation>Waarschuwing</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="363"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>Duiken worden NIET in de duiklijst geladen als u de libdivecomputer dump opslaat.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="374"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Kies een bestand voor de duikcomputer binaire dump</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="375"/>
         <source>Dump files (*.bin)</source>
         <translation>Dump bestanden (*.bin)</translation>
     </message>
@@ -2348,7 +2522,7 @@ duikcomputer wilt verwijderen?</translation>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="101"/>
         <source>Vendor</source>
         <translation>Merk</translation>
     </message>
@@ -2358,54 +2532,74 @@ duikcomputer wilt verwijderen?</translation>
         <translation>Downloaden van duikcomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="31"/>
         <source>Device or mount point</source>
         <translation>Device of mountpoint</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="111"/>
         <source>Dive computer</source>
         <translation>Duikcomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="132"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="45"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="80"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="94"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="52"/>
         <source>Force download of all dives</source>
         <translation>Forceer download van alle duiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
         <source>Always prefer downloaded dives</source>
         <translation>Altijd gedownloade duiken gebruiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="189"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/>
+        <source>Downloaded Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
+        <source>Select all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
+        <source>Unselect all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
         <source>Save libdivecomputer logfile</source>
         <translation>libdivecomputer logbestand opslaan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="87"/>
         <source>Save libdivecomputer dumpfile</source>
         <translation>libdivecomputer dump opslaan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
         <source>Download into new trip</source>
         <translation>Ophalen als een nieuwe trip</translation>
     </message>
@@ -2413,12 +2607,12 @@ duikcomputer wilt verwijderen?</translation>
 <context>
     <name>ExtraDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Key</source>
         <translation>Sleutel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Value</source>
         <translation>Waarde</translation>
     </message>
@@ -2432,22 +2626,20 @@ duikcomputer wilt verwijderen?</translation>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="245"/>
-        <source>Your dive profile was updated to facebook.</source>
-        <translation>Uw duikprofiel is naar facebook verzonden</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
-        <source>Photo Upload Failed</source>
-        <translation>Foto opladen mislukt</translation>
+        <source>Your dive profile was updated to Facebook.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="250"/>
-        <source>Your dive profile was not updated to facebook, 
+        <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
-        <translation>Uw duikprofiel was niet naar facebook verzonden.
-Zend het volgende naar de ontwikkelaar.
-</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+        <source>Photo Upload Failed</source>
+        <translation>Foto opladen mislukt</translation>
     </message>
 </context>
 <context>
@@ -2489,17 +2681,17 @@ Zend het volgende naar de ontwikkelaar.
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1544"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1621"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Deze functie is nog niet beschikbaar voor de geselecteerde duikcomputer</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1624"/>
         <source>Firmware update failed!</source>
         <translation>Firmware bijwerken mislukt!</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1550"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1627"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Kan geen verbinding maken met de duikcomputer</translation>
     </message>
@@ -2507,7 +2699,7 @@ Zend het volgende naar de ontwikkelaar.
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="128"/>
+        <location filename="../qt-ui/globe.cpp" line="119"/>
         <source>Edit selected dive locations</source>
         <translation>Bewerk geselecteerde duiklocaties</translation>
     </message>
@@ -2515,7 +2707,7 @@ Zend het volgende naar de ontwikkelaar.
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="566"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="549"/>
         <source>Location: </source>
         <translation>Locatie:</translation>
     </message>
@@ -2523,7 +2715,7 @@ Zend het volgende naar de ontwikkelaar.
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="286"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="283"/>
         <source>No location set</source>
         <translation>Locatie niet ingesteld</translation>
     </message>
@@ -2531,330 +2723,335 @@ Zend het volgende naar de ontwikkelaar.
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="133"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
+        <location filename="../qt-ui/maintab.cpp" line="497"/>
         <source>Location</source>
         <translation>Locatie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="67"/>
         <source>Coordinates</source>
         <translation>Coördinaten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="169"/>
         <source>Divemaster</source>
         <translation>Duikleider</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="154"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="222"/>
+        <location filename="../qt-ui/maintab.ui" line="277"/>
         <source>Tags</source>
         <translation>Trefwoorden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="186"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
         <source>Rating</source>
         <translation>Waardering</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="221"/>
         <source>Visibility</source>
         <translation>Zicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="230"/>
         <source>Suit</source>
         <translation>Pak</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="465"/>
+        <location filename="../qt-ui/maintab.cpp" line="470"/>
         <source>Dive notes</source>
         <translation>Duiknotities</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
-        <location filename="../qt-ui/maintab.ui" line="648"/>
-        <location filename="../qt-ui/maintab.cpp" line="277"/>
+        <location filename="../qt-ui/maintab.ui" line="74"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="102"/>
+        <location filename="../qt-ui/maintab.ui" line="677"/>
+        <location filename="../qt-ui/maintab.cpp" line="279"/>
         <source>Air temp.</source>
         <translation>Lucht temp.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <location filename="../qt-ui/maintab.ui" line="667"/>
-        <location filename="../qt-ui/maintab.cpp" line="278"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.ui" line="696"/>
+        <location filename="../qt-ui/maintab.cpp" line="280"/>
         <source>Water temp.</source>
         <translation>Water temp.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="229"/>
-        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.ui" line="284"/>
+        <location filename="../qt-ui/maintab.cpp" line="498"/>
         <source>Notes</source>
         <translation>Notities</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="369"/>
+        <location filename="../qt-ui/maintab.ui" line="398"/>
         <source>Equipment</source>
         <translation>Uitrusting</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="496"/>
+        <location filename="../qt-ui/maintab.ui" line="525"/>
         <source>Gases used</source>
         <translation>Gebruikte gassen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="515"/>
+        <location filename="../qt-ui/maintab.ui" line="544"/>
         <source>Gas consumed</source>
         <translation>Gasverbruik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="553"/>
+        <location filename="../qt-ui/maintab.ui" line="582"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="591"/>
+        <location filename="../qt-ui/maintab.ui" line="620"/>
         <source>Max. depth</source>
         <translation>Max. diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="629"/>
+        <location filename="../qt-ui/maintab.ui" line="658"/>
         <source>Air pressure</source>
         <translation>Luchtdruk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="686"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>Dive time</source>
         <translation>Duiktijd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="845"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
         <source>Total time</source>
         <translation>Totale tijd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="903"/>
+        <location filename="../qt-ui/maintab.ui" line="932"/>
         <source>Gas consumption</source>
         <translation>Gasverbruik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="962"/>
+        <location filename="../qt-ui/maintab.ui" line="991"/>
         <source>Extra data</source>
         <translation>Extra gegevens</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="968"/>
+        <location filename="../qt-ui/maintab.ui" line="997"/>
         <source>Additional data from dive computer</source>
         <translation>Bijkomende gegevens van duikcomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="54"/>
-        <location filename="../qt-ui/maintab.ui" line="458"/>
+        <location filename="../qt-ui/maintab.ui" line="83"/>
+        <location filename="../qt-ui/maintab.ui" line="487"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="61"/>
+        <location filename="../qt-ui/maintab.ui" line="90"/>
         <source>Time</source>
         <translation>Tijd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="425"/>
+        <location filename="../qt-ui/maintab.ui" line="454"/>
         <source>Dive info</source>
         <translation>Duikinformatie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="477"/>
+        <location filename="../qt-ui/maintab.ui" line="506"/>
         <source>Interval</source>
         <translation>Interval</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="534"/>
-        <location filename="../qt-ui/maintab.ui" line="799"/>
+        <location filename="../qt-ui/maintab.ui" line="563"/>
+        <location filename="../qt-ui/maintab.ui" line="828"/>
         <source>SAC</source>
         <translation>Gasverbruik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="610"/>
+        <location filename="../qt-ui/maintab.ui" line="639"/>
         <source>Avg. depth</source>
         <translation>Gem. diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="572"/>
+        <location filename="../qt-ui/maintab.ui" line="601"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="734"/>
         <source>Salinity</source>
         <translation>Zoutgehalte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="742"/>
+        <location filename="../qt-ui/maintab.ui" line="771"/>
         <source>Stats</source>
         <translation>Statistieken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="775"/>
+        <location filename="../qt-ui/maintab.ui" line="804"/>
         <source>Depth</source>
         <translation>Diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="787"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Temperature</source>
         <translation>Temperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="813"/>
+        <location filename="../qt-ui/maintab.ui" line="842"/>
         <source>Duration</source>
         <translation>Duur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="864"/>
+        <location filename="../qt-ui/maintab.ui" line="893"/>
         <source>Dives</source>
         <translation>Duiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="948"/>
+        <location filename="../qt-ui/maintab.ui" line="977"/>
         <source>Photos</source>
         <translation>Foto&apos;s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="95"/>
+        <location filename="../qt-ui/maintab.cpp" line="87"/>
         <source>Cylinders</source>
         <translation>Flessen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="99"/>
+        <location filename="../qt-ui/maintab.cpp" line="91"/>
         <source>Weights</source>
         <translation>Gewichten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="55"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Apply changes</source>
         <translation>Wijzigingen toepassen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="59"/>
+        <location filename="../qt-ui/maintab.cpp" line="50"/>
         <source>Discard changes</source>
         <translation>Wijzigingen verwijderen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="96"/>
+        <location filename="../qt-ui/maintab.cpp" line="88"/>
         <source>Add cylinder</source>
         <translation>Fles toevoegen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="100"/>
+        <location filename="../qt-ui/maintab.cpp" line="92"/>
         <source>Add weight system</source>
         <translation>Voeg gewichtssysteem toe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="274"/>
+        <location filename="../qt-ui/maintab.cpp" line="276"/>
         <source>Air temp. [%1]</source>
         <translation>Lucht temp. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="275"/>
+        <location filename="../qt-ui/maintab.cpp" line="277"/>
         <source>Water temp. [%1]</source>
         <translation>Water temp. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="312"/>
+        <location filename="../qt-ui/maintab.cpp" line="314"/>
         <source>This trip is being edited.</source>
         <translation>Deze trip wordt bewerkt.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="320"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Multiple dives are being edited.</source>
         <translation>Meerdere duiken worden bewerkt.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.cpp" line="324"/>
         <source>This dive is being edited.</source>
         <translation>Deze duik wordt bewerkt.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="436"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
+        <location filename="../qt-ui/maintab.cpp" line="465"/>
         <source>Trip notes</source>
         <translation>Trip notities</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="458"/>
+        <location filename="../qt-ui/maintab.cpp" line="463"/>
         <source>Trip location</source>
         <translation>Trip locatie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="526"/>
-        <location filename="../qt-ui/maintab.cpp" line="558"/>
-        <location filename="../qt-ui/maintab.cpp" line="562"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
         <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="574"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="555"/>
+        <location filename="../qt-ui/maintab.cpp" line="563"/>
         <source>Deepest dive</source>
         <translation>Diepste duik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="556"/>
+        <location filename="../qt-ui/maintab.cpp" line="564"/>
         <source>Shallowest dive</source>
         <translation>Ondiepste duik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="569"/>
+        <location filename="../qt-ui/maintab.cpp" line="577"/>
         <source>Highest total SAC of a dive</source>
         <translation>Hoogste SAC van een duik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="578"/>
         <source>Lowest total SAC of a dive</source>
         <translation>Laagste SAC van een duik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="571"/>
+        <location filename="../qt-ui/maintab.cpp" line="579"/>
         <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="582"/>
+        <location filename="../qt-ui/maintab.cpp" line="590"/>
         <source>Highest temperature</source>
         <translation>Hoogste temperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="583"/>
+        <location filename="../qt-ui/maintab.cpp" line="591"/>
         <source>Lowest temperature</source>
         <translation>Laagste temperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="584"/>
+        <location filename="../qt-ui/maintab.cpp" line="592"/>
         <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="594"/>
+        <location filename="../qt-ui/maintab.cpp" line="602"/>
         <source>Longest dive</source>
         <translation>Langste duik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="595"/>
+        <location filename="../qt-ui/maintab.cpp" line="603"/>
         <source>Shortest dive</source>
         <translation>Kortste duik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="596"/>
+        <location filename="../qt-ui/maintab.cpp" line="604"/>
         <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="620"/>
+        <location filename="../qt-ui/maintab.cpp" line="628"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -2863,17 +3060,17 @@ worden uit lucht en:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="624"/>
+        <location filename="../qt-ui/maintab.cpp" line="632"/>
         <source> and </source>
         <translation>en</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="911"/>
+        <location filename="../qt-ui/maintab.cpp" line="925"/>
         <source>Discard the changes?</source>
         <translation>Wijzigingen niet opslaan?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="912"/>
+        <location filename="../qt-ui/maintab.cpp" line="926"/>
         <source>You are about to discard your changes.</source>
         <translation>U staat op het punt wijzigingen te verwijderen</translation>
     </message>
@@ -3020,7 +3217,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="296"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="232"/>
         <source>Open</source>
         <translation>Open</translation>
     </message>
@@ -3380,90 +3577,90 @@ p, li { white-space: pre-wrap; }
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="252"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="229"/>
         <source>Open file</source>
         <translation>Bestand openen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="256"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="233"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="332"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="309"/>
         <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="444"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
         <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="491"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
         <source>Print runtime table</source>
         <translation>Runtime tabel afdrukken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="834"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="811"/>
         <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="836"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="813"/>
         <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="841"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="818"/>
         <source>Save changes?</source>
         <translation>Aanpassingen opslaan?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1196"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1173"/>
         <source>Save file as</source>
         <translation>Bestand bewaren als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1337"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1314"/>
         <source>Open dive log file</source>
         <translation>Open duiklogboek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="819"/>
         <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="300"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="444"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="277"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Warning</source>
         <translation>Waarschuwing</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1180"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1157"/>
         <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="625"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="602"/>
         <source>Yearly statistics</source>
         <translation>Jaarlijkse statistieken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1197"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1174"/>
         <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="1338"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1315"/>
         <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source>
         <translation>Duiklog bestanden (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran bestanden (*.can);;CSV bestanden (*.csv);;DiveLog.de bestanden (*.dld);;JDiveLog bestanden (*.jlb);;Liquivision bestanden (*.lvd);;MkVI bestanden (*.txt);;Suunto bestanden (*.sde *.db);;Divesoft bestanden (*.dlf);;UDDF/UDCF bestanden (*.uddf *.udcf);;XML bestanden (*.xml);;Alle bestanden (*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <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>
@@ -3471,7 +3668,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="651"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="634"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Filter toont %1 (van %2) duiken</translation>
     </message>
@@ -3479,12 +3676,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="239"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation>U moet de firmware van uw duikcomputer updaten: u heeft versie %1 maar de laatste stabiele versie is %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="243"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
@@ -3493,27 +3690,27 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een logboek download vóór u verder gaat met de update</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="244"/>
         <source>Not now</source>
         <translation>Niet nu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="245"/>
         <source>Update firmware</source>
         <translation>Firmware updaten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
         <source>Firmware upgrade notice</source>
         <translation>Firmware upgrade mededeling</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
         <source>Save the downloaded firmware as</source>
         <translation>Bewaar de firmware als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
         <source>HEX files (*.hex)</source>
         <translation>HEX bestanden (*.hex)</translation>
     </message>
@@ -3521,54 +3718,69 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Open circuit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="481"/>
         <source>Last stop at 20ft</source>
         <translation>Laatste stop op 20ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="482"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% gem. diepte tot 20ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="489"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
         <source>20ft to surface</source>
         <translation>20ft tot oppervlakte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="485"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
         <source>Last stop at 6m</source>
         <translation>Laatste stop op 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% gem. diepte tot 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="494"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
         <source>6m to surface</source>
         <translation>6m tot oppervlakte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="497"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="498"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
         <source>cuft/min</source>
         <translation>cuft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="506"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="507"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="500"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="501"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
@@ -3687,6 +3899,7 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="816"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -3721,57 +3934,87 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="795"/>
+        <source>CCR: Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="809"/>
+        <source>Default CCR set-point for dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="832"/>
+        <source>pSCR O₂ metabolism rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="839"/>
+        <source>pSCR ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="846"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="859"/>
+        <source>1:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="875"/>
         <source>System default</source>
         <translation>Systeem standaardinstelling</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="843"/>
+        <location filename="../qt-ui/preferences.ui" line="914"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="849"/>
+        <location filename="../qt-ui/preferences.ui" line="920"/>
         <source>Proxy type</source>
         <translation>Proxy type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="862"/>
+        <location filename="../qt-ui/preferences.ui" line="933"/>
         <source>Host</source>
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="888"/>
+        <location filename="../qt-ui/preferences.ui" line="959"/>
         <source>Port</source>
         <translation>Poort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="914"/>
+        <location filename="../qt-ui/preferences.ui" line="985"/>
         <source>Requires authentication</source>
         <translation>Authenticatie vereist</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="934"/>
+        <location filename="../qt-ui/preferences.ui" line="1005"/>
         <source>Username</source>
         <translation>Gebruikersnaam</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="957"/>
+        <location filename="../qt-ui/preferences.ui" line="1028"/>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="985"/>
-        <source>about:blank</source>
-        <translation>over:leeg</translation>
+        <location filename="../qt-ui/preferences.ui" line="1079"/>
+        <source>Disconnect from Facebook</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1011"/>
-        <source>Disconnect from facebook</source>
-        <translation>Facebook afkoppelen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="824"/>
+        <location filename="../qt-ui/preferences.ui" line="895"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
@@ -3926,52 +4169,52 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="28"/>
+        <location filename="../qt-ui/preferences.cpp" line="44"/>
         <source>No proxy</source>
         <translation>Geen proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="29"/>
+        <location filename="../qt-ui/preferences.cpp" line="45"/>
         <source>System proxy</source>
         <translation>Systeem proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="30"/>
+        <location filename="../qt-ui/preferences.cpp" line="46"/>
         <source>HTTP proxy</source>
         <translation>HTTP proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="31"/>
+        <location filename="../qt-ui/preferences.cpp" line="47"/>
         <source>SOCKS proxy</source>
         <translation>SOCKS proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="291"/>
+        <location filename="../qt-ui/preferences.cpp" line="324"/>
         <source>Restart required</source>
         <translation>Herstarten noodzakelijk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="292"/>
+        <location filename="../qt-ui/preferences.cpp" line="325"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>Om een nieuwe taal te laden dient u Subsurface te herstarten.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="456"/>
+        <location filename="../qt-ui/preferences.cpp" line="494"/>
         <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
         <translation>Alle voorkeuren van Subsurface worden teruggezet naar hun originele waarden wanneer u op OK klikt. Dit zal onmiddellijk gebeuren.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML bestanden (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Open default log file</source>
         <translation>Standaard logboek openen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="455"/>
+        <location filename="../qt-ui/preferences.cpp" line="493"/>
         <source>Warning</source>
         <translation>Waarschuwing</translation>
     </message>
@@ -3979,17 +4222,17 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="91"/>
+        <location filename="../qt-ui/printdialog.cpp" line="85"/>
         <source>&amp;Preview</source>
         <translation>Voorbeeldweergave</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="88"/>
+        <location filename="../qt-ui/printdialog.cpp" line="82"/>
         <source>P&amp;rint</source>
         <translation>Afd&amp;rukken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="103"/>
+        <location filename="../qt-ui/printdialog.cpp" line="97"/>
         <source>Print</source>
         <translation>Afdrukken</translation>
     </message>
@@ -3997,42 +4240,42 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="20"/>
         <source>Dive#</source>
         <translation>Duik nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="21"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="22"/>
         <source>Depth</source>
         <translation>Diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="23"/>
         <source>Duration</source>
         <translation>Duur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Master</source>
         <translation>Master</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="34"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Location</source>
         <translation>Locatie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <location filename="../qt-ui/printlayout.cpp" line="63"/>
         <source>Subsurface cannot find a usable printer on this system!</source>
         <translation>Subsurface kan geen bruikbare printers vinden op dit systeem!</translation>
     </message>
@@ -4098,72 +4341,72 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2095"/>
+        <location filename="../qt-ui/models.cpp" line="2101"/>
         <source>unknown</source>
         <translation>onbekend</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2100"/>
+        <location filename="../qt-ui/models.cpp" line="2106"/>
         <source>Dive #%1 - %2</source>
         <translation>Duik #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2103"/>
+        <location filename="../qt-ui/models.cpp" line="2109"/>
         <source>Max depth: %1 %2</source>
         <translation>Max diepte: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2110"/>
+        <location filename="../qt-ui/models.cpp" line="2116"/>
         <source>Duration: %1 min</source>
         <translation>Duur: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2115"/>
+        <location filename="../qt-ui/models.cpp" line="2121"/>
         <source>Gas used:</source>
         <translation>Verbruikt gas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2117"/>
+        <location filename="../qt-ui/models.cpp" line="2123"/>
         <source>Tags:</source>
         <translation>Trefwoorden:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2119"/>
+        <location filename="../qt-ui/models.cpp" line="2125"/>
         <source>SAC:</source>
         <translation>Gasverbruik:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2121"/>
+        <location filename="../qt-ui/models.cpp" line="2127"/>
         <source>Weights:</source>
         <translation>Gewichten:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2126"/>
+        <location filename="../qt-ui/models.cpp" line="2132"/>
         <source>Notes:</source>
         <translation>Nota&apos;s:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2133"/>
+        <location filename="../qt-ui/models.cpp" line="2139"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2135"/>
+        <location filename="../qt-ui/models.cpp" line="2141"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2137"/>
+        <location filename="../qt-ui/models.cpp" line="2143"/>
         <source>Suit:</source>
         <translation>Duikpak:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2139"/>
+        <location filename="../qt-ui/models.cpp" line="2145"/>
         <source>Viz:</source>
         <translation>Zichtbaarheid:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2141"/>
+        <location filename="../qt-ui/models.cpp" line="2147"/>
         <source>Rating:</source>
         <translation>Beoordeling:</translation>
     </message>
@@ -4171,103 +4414,108 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="628"/>
         <source> (#%1 of %2)</source>
         <translation> (#%1 van %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="630"/>
+        <source>Unknown dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="647"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>NDL / TTS wordt niet getoond omdat de berekening te lang duurt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1168"/>
         <source>Make first divecomputer</source>
         <translation>Eerste duikcomputer aanmaken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Delete this divecomputer</source>
         <translation>Deze duikcomputer verwijderen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1184"/>
         <source>Add gas change</source>
         <translation>Gaswissel toevoegen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1187"/>
         <source> (Tank %1)</source>
         <translation> (Fles %1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1195"/>
         <source>Add set-point change</source>
         <translation>Voeg set-point wissel toe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1197"/>
         <source>Add bookmark</source>
         <translation>Bladwijzer toevoegen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
         <source>Remove event</source>
         <translation>Gebeurtenis verwijderen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1206"/>
         <source>Hide similar events</source>
         <translation>Gelijkaardige gebeurtenissen verbergen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1213"/>
         <source>Edit name</source>
         <translation>Naam bewerken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1242"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1249"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>Druk van fles %1 aanpassen (nu geschat op %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1264"/>
         <source>Unhide all events</source>
         <translation>Toon alle gebeurtenissen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide events</source>
         <translation>Gebeurtenissen verbergen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide all %1 events?</source>
         <translation>Alle %1 gebeurtenissen verbergen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1333"/>
         <source>Remove the selected event?</source>
         <translation>Geselecteerde gebeurtenis verwijderen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1334"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1424"/>
         <source>Edit name of bookmark</source>
         <translation>Naam bladwijzer bewerken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
         <source>Custom name:</source>
         <translation>Naam:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1430"/>
         <source>Name is too long!</source>
         <translation>Deze naam is te lang!</translation>
     </message>
@@ -4275,102 +4523,102 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>AIR</source>
         <translation>AIR</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>OXYGEN</source>
         <translation>ZUURSTOF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="208"/>
         <source>Remove this point</source>
         <translation>Dit punt verwijderen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="57"/>
         <source>Close</source>
         <translation>Sluiten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="42"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="25"/>
         <source>Average</source>
         <translation>Gemiddelde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="45"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="28"/>
         <source>Minimum</source>
         <translation>Kleinste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="48"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="31"/>
         <source>Maximum</source>
         <translation>Grootste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="297"/>
+        <location filename="../qt-ui/globe.cpp" line="296"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>Verplaats de kaart en dubbelklikk om de duiklocatie te selecteren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="525"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="526"/>
         <source>lbs</source>
         <translation>US pond</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="550"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="551"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="570"/>
+        <location filename="../qt-ui/models.cpp" line="574"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="571"/>
+        <location filename="../qt-ui/models.cpp" line="575"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="595"/>
+        <location filename="../qt-ui/models.cpp" line="599"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="596"/>
+        <location filename="../qt-ui/models.cpp" line="600"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="513"/>
         <source>Invalid response from server</source>
         <translation>Ongeldig antwoord van de server</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation>XML etiket &apos;DiveDateReader&apos; werd verwacht, maar kreeg &apos;%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="567"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation>Verwacht XML etket &apos;DiveDates&apos; werd niet gevonden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Slecht gevormd XML antwoord. Lijn %1: %2</translation>
     </message>
@@ -4378,12 +4626,12 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1450"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1518"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Deze functie is nog niet beschikbaar voor de geselecteerde duikcomputer.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1442"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Kon geen verbinding maken met de duikcomputer.</translation>
     </message>
@@ -4397,12 +4645,12 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
-        <location filename="../qt-ui/simplewidgets.cpp" line="151"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="134"/>
         <source>New starting number</source>
         <translation>Nieuw beginnummer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="149"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="132"/>
         <source>New number</source>
         <translation>Nieuw nummer</translation>
     </message>
@@ -4410,12 +4658,12 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1575"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1653"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Deze functie is nog niet beschikbaar voor de geselecteerde duikcomputer.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1579"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1657"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Kon geen verbinding maken met de duikcomputer.</translation>
     </message>
@@ -4494,12 +4742,12 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
         <translation>Welke datum en tijd worden weergegeven in de afbeelding?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="276"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="259"/>
         <source>Open image file</source>
         <translation>Afbeelding openen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="278"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="261"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Afbeeldingen (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -4552,10 +4800,9 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
     <name>SocialNetworkDialog</name>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="282"/>
-        <source>Dive Date: %1 
+        <source>Dive date: %1 
 </source>
-        <translation>Duik Datum: %1
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="285"/>
@@ -4578,10 +4825,9 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="290"/>
-        <source>Dive Location: %1 
+        <source>Dive location: %1 
 </source>
-        <translation>Duiklocatie: %1 
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="293"/>
@@ -4699,47 +4945,47 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="329"/>
         <source>Webservice</source>
         <translation>Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="393"/>
         <source>Connecting...</source>
         <translation>Verbinding wordt opgezet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
         <source>Download finished</source>
         <translation>Download klaar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Download error: %1</source>
         <translation>Download fout: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="436"/>
         <source>Connection error: </source>
         <translation>Verbindingsfout:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
         <source>Download successful</source>
         <translation>Laden succesvol voltooid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="439"/>
         <source>Invalid user identifier!</source>
         <translation>Ongeldige gebruikersidentificatie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="312"/>
         <source>Enter User ID and click Download</source>
         <translation>Geef GebruikersID en klik op Download</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="442"/>
         <source>Cannot parse response!</source>
         <translation>Kan antwoord niet parsen!</translation>
     </message>
@@ -4747,7 +4993,7 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="592"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="575"/>
         <source>Suits: </source>
         <translation>Duikpakken:</translation>
     </message>
@@ -4755,7 +5001,7 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="119"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="116"/>
         <source>No suit set</source>
         <translation>Geen duikpak geselecteerd</translation>
     </message>
@@ -4772,7 +5018,7 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="513"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="496"/>
         <source>Tags: </source>
         <translation>Trefwoorden:</translation>
     </message>
@@ -4780,7 +5026,7 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="144"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="141"/>
         <source>Empty tags</source>
         <translation>Lege trefwoorden</translation>
     </message>
@@ -4788,17 +5034,17 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>Description</source>
         <translation>Beschrijving</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -4806,7 +5052,7 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="141"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="131"/>
         <source>Information</source>
         <translation>Informatie</translation>
     </message>
@@ -4814,7 +5060,7 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1090"/>
+        <location filename="../qt-ui/models.cpp" line="1094"/>
         <source> (%1 shown)</source>
         <translation> (%1 getoond)</translation>
     </message>
@@ -4822,72 +5068,72 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="64"/>
         <source>Check for updates.</source>
         <translation>Zoek naar updates.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="66"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface kon niet zoeken naar updates.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="70"/>
         <source>The following error occurred:</source>
         <translation>De volgende fout trad op:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="72"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
         <source>Please check your internet connection.</source>
         <translation>Controleer uw internetverbinding.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="85"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="84"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>U gebruikt de meest recente versie van Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="88"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>Er is een nieuwe versie van Subsurface beschikbaar.&lt;br/&gt;Klik op:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; om te downloaden.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="95"/>
         <source>A new version of Subsurface is available.</source>
         <translation>Er is een nieuwe versie van Subsurface beschikbaar.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="97"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
         <source>Latest version is %1, please check with your OS vendor for updates.</source>
         <translation>De nieuwste versie is %1. Neem contact op met de verdeler van uw besturingssysteem voor updates.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="103"/>
         <source>Newest release version is </source>
         <translation>De nieuwste officiele versie is</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="105"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
         <source>The server returned the following information:</source>
         <translation>De server gaf het volgende antwoord:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="121"/>
         <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation>Subsurface controleert elke twee weken of er een nieuwe versie beschikbaar is. Als u dat niet wilt, selecteer dan Weigeren.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
         <source>Decline</source>
         <translation>Weigeren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="124"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
         <source>Accept</source>
         <translation>Aanvaarden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="126"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="125"/>
         <source>Automatic check for updates</source>
         <translation>Automatisch controleren of er updates zijn</translation>
     </message>
@@ -4895,13 +5141,13 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
 <context>
     <name>UserManual</name>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="55"/>
+        <location filename="../qt-ui/usermanual.cpp" line="54"/>
         <source>User Manual</source>
         <translation>Handleiding</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="72"/>
-        <location filename="../qt-ui/usermanual.cpp" line="78"/>
+        <location filename="../qt-ui/usermanual.cpp" line="71"/>
+        <location filename="../qt-ui/usermanual.cpp" line="77"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>De handleiding kan niet gevonden worden</translation>
     </message>
@@ -4979,85 +5225,85 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
         <translation>Van waar importeert u gegevens?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
         <source>
 Operating System: %1</source>
         <translation>
 Besturingssysteem: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 Centrale verwerkingseenheid: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 Language: %1</source>
         <translation>
 Taal: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="93"/>
         <source>Should we ask you later?</source>
         <translation>Mogen we dit later vragen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Don&apos;t ask me again</source>
         <translation>Niet opnieuw vragen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Ask later</source>
         <translation>Later vragen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
         <source>Submit user survey.</source>
         <translation>Gebruikersenquete verzenden.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask again?</source>
         <translation>Opnieuw vragen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="17"/>
         <source>Send</source>
         <translation>Verzend</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>
 Besturingssysteem CPU %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation>Subsurface kon de gebruikersenquete niet verzenden.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="121"/>
         <source>The following error occurred:</source>
         <translation>De volgende fout trad op:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>Please check your internet connection.</source>
         <translation>Controleer uw internetverbinding</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="131"/>
         <source>Survey successfully submitted.</source>
         <translation>Gebruikersenquete verzonden.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="136"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation>Bij het zoeken naar updates trad een fout op.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -5065,12 +5311,12 @@ Besturingssysteem CPU %1</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>Description</source>
         <translation>Beschrijving</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -5118,12 +5364,12 @@ Besturingssysteem CPU %1</translation>
         <translation>Uploaden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="247"/>
         <source>Operation timed out</source>
         <translation>Operatie duurt te lang</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="268"/>
         <source>Transferring data...</source>
         <translation>Gegevens worden overgebracht...</translation>
     </message>
@@ -5131,17 +5377,17 @@ Besturingssysteem CPU %1</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="496"/>
+        <location filename="../qt-ui/models.cpp" line="500"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Hier klikken om dit gewichtssysteem te verwijderen.</translation>
     </message>
@@ -5149,19 +5395,19 @@ Besturingssysteem CPU %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1479"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1487"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1497"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1555"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1566"/>
         <source>Failed!</source>
         <translation>Mislukt!</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1506"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1576"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Deze functie is nog niet beschikbaar voor de geselecteerde duikcomputer.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1580"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Kon geen verbinding maken met de duikcomputer.</translation>
     </message>
@@ -5169,79 +5415,79 @@ Besturingssysteem CPU %1</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1841"/>
+        <location filename="../qt-ui/models.cpp" line="1847"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Jaar
  &gt; Maand / Trip</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1844"/>
+        <location filename="../qt-ui/models.cpp" line="1850"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1847"/>
+        <location filename="../qt-ui/models.cpp" line="1853"/>
         <source>Duration 
  Total</source>
         <translation>Duur
  Totaal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1850"/>
+        <location filename="../qt-ui/models.cpp" line="1856"/>
         <source>
 Average</source>
         <translation>
 Gemiddeld</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1853"/>
+        <location filename="../qt-ui/models.cpp" line="1859"/>
         <source>
 Shortest</source>
         <translation>
 Kortste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1856"/>
+        <location filename="../qt-ui/models.cpp" line="1862"/>
         <source>
 Longest</source>
         <translation>
 Langste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1859"/>
+        <location filename="../qt-ui/models.cpp" line="1865"/>
         <source>Depth (%1)
  Average</source>
         <translation>Diepte (%1)
  Gemiddeld</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1862"/>
-        <location filename="../qt-ui/models.cpp" line="1871"/>
-        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>
 Minimum</source>
         <translation>
 Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1865"/>
-        <location filename="../qt-ui/models.cpp" line="1874"/>
-        <location filename="../qt-ui/models.cpp" line="1883"/>
+        <location filename="../qt-ui/models.cpp" line="1871"/>
+        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>
 Maximum</source>
         <translation>
 Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1874"/>
         <source>SAC (%1)
  Average</source>
         <translation>Gasverbruik (%1)
  Gemiddeld</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1883"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -5322,40 +5568,40 @@ Maximum</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1508"/>
+        <location filename="../dive.c" line="1530"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) of (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="464"/>
+        <location filename="../divelist.c" line="467"/>
         <location filename="../equipment.c" line="81"/>
-        <location filename="../planner.c" line="1060"/>
-        <location filename="../planner.c" line="1063"/>
+        <location filename="../planner.c" line="1081"/>
+        <location filename="../planner.c" line="1084"/>
         <source>air</source>
         <translation>lucht</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="192"/>
+        <location filename="../equipment.c" line="194"/>
         <source>integrated</source>
         <translation>Geïntegreerd</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="193"/>
+        <location filename="../equipment.c" line="195"/>
         <source>belt</source>
         <translation>riem</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="194"/>
+        <location filename="../equipment.c" line="196"/>
         <source>ankle</source>
         <translation>enkel</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="195"/>
+        <location filename="../equipment.c" line="197"/>
         <source>backplate weight</source>
         <translation>backplate-gewicht</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="196"/>
+        <location filename="../equipment.c" line="198"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -5363,7 +5609,7 @@ Maximum</translation>
         <location filename="../file.c" line="112"/>
         <location filename="../file.c" line="434"/>
         <location filename="../file.c" line="506"/>
-        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="925"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Fout bij lezen van &apos;%s&apos;</translation>
     </message>
@@ -5420,9 +5666,9 @@ Maximum</translation>
         <translation>Geen duikcomputer gevonden voor bestand &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../file.c" line="869"/>
-        <location filename="../file.c" line="909"/>
-        <location filename="../file.c" line="1007"/>
+        <location filename="../file.c" line="870"/>
+        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="1016"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>Het maximum aantal kolommen bij CSV importeren is %d</translation>
     </message>
@@ -5593,27 +5839,27 @@ Maximum</translation>
         <translation>ongeldig event-nummer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="421"/>
+        <location filename="../libdivecomputer.c" line="419"/>
         <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="427"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Error registering the data</source>
         <translation>Fout bij het registreren van de data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="433"/>
         <source>Error parsing the datetime</source>
         <translation>Fout bij verwerken van de datum en tijd</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Dive %d: %s</source>
         <translation>Duik nr. %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="455"/>
+        <location filename="../libdivecomputer.c" line="454"/>
         <source>Error parsing the divetime</source>
         <translation>Fout bij verwerken van de duikduur</translation>
     </message>
@@ -5623,166 +5869,166 @@ Maximum</translation>
         <translation>Fout bij het verwerken van de maximum duikdiepte</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="482"/>
+        <location filename="../libdivecomputer.c" line="483"/>
         <source>Error parsing temperature</source>
         <translation>Fout bij het verwerken van de temperatuur</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="501"/>
+        <location filename="../libdivecomputer.c" line="503"/>
         <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="513"/>
+        <location filename="../libdivecomputer.c" line="515"/>
         <source>Error obtaining water salinity</source>
         <translation>Fout bij het verkrijgen van het zoutgehalte</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="521"/>
+        <location filename="../libdivecomputer.c" line="524"/>
         <source>Error obtaining surface pressure</source>
         <translation>Fout bij bekomen van oppervlaktedruk</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="545"/>
+        <location filename="../libdivecomputer.c" line="549"/>
         <source>Error obtaining divemode</source>
         <translation>Fout bij bepalen duikmodus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="562"/>
+        <location filename="../libdivecomputer.c" line="569"/>
         <source>Error parsing the gas mix</source>
         <translation>Fout bij het verwerken van het gasmengsel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="569"/>
+        <location filename="../libdivecomputer.c" line="576"/>
         <source>Error parsing the samples</source>
         <translation>Fout bij het verwerken van de samples</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="706"/>
+        <location filename="../libdivecomputer.c" line="713"/>
         <source>Event: waiting for user action</source>
         <translation>Event: wachten op handeling van gebruiker</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="714"/>
+        <location filename="../libdivecomputer.c" line="721"/>
         <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="778"/>
+        <location filename="../libdivecomputer.c" line="785"/>
         <source>Error registering the event handler.</source>
         <translation>Fout bij het registreren van de event handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="783"/>
+        <location filename="../libdivecomputer.c" line="790"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Fout bij het registreren van de cancellation handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="804"/>
+        <location filename="../libdivecomputer.c" line="811"/>
         <source>Dive data import error</source>
         <translation>Fout bij importeren van duikdata</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="843"/>
+        <location filename="../libdivecomputer.c" line="850"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Kan geen context creëren voor libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="850"/>
+        <location filename="../libdivecomputer.c" line="857"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Fout bij openen van  %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="858"/>
+        <location filename="../libdivecomputer.c" line="865"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Privileges ontoereikend voor toegang tot het toestel %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="506"/>
+        <location filename="../parse-xml.c" line="516"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Vreemde percentage %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1760"/>
+        <location filename="../parse-xml.c" line="1770"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Fout bij analyse van &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1989"/>
-        <location filename="../parse-xml.c" line="2137"/>
+        <location filename="../parse-xml.c" line="1999"/>
+        <location filename="../parse-xml.c" line="2147"/>
         <source>Database query dm4_events failed.
 </source>
         <translation>Database query dm4_events mislukt.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1996"/>
-        <location filename="../parse-xml.c" line="2144"/>
+        <location filename="../parse-xml.c" line="2006"/>
+        <location filename="../parse-xml.c" line="2154"/>
         <source>Database query dm4_tags failed.
 </source>
         <translation>Database query dm4_tags mislukt.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2318"/>
+        <location filename="../parse-xml.c" line="2328"/>
         <source>Database query shearwater_cylinders failed.
 </source>
         <translation>Database query shearwater_cylinders mislukt.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2325"/>
+        <location filename="../parse-xml.c" line="2335"/>
         <source>Database query shearwater_changes failed.
 </source>
         <translation>Database query shearwater_changes mislukt.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2332"/>
+        <location filename="../parse-xml.c" line="2342"/>
         <source>Database query shearwater_profile_sample failed.
 </source>
         <translation>Database query shearwater_profile_sample mislukt.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2451"/>
+        <location filename="../parse-xml.c" line="2461"/>
         <source>Database query cobalt_cylinders failed.
 </source>
         <translation>Database query cobalt_cylinders mislukt.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2458"/>
+        <location filename="../parse-xml.c" line="2468"/>
         <source>Database query cobalt_buddies failed.
 </source>
         <translation>Database query cobalt_buddies mislukt.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2465"/>
+        <location filename="../parse-xml.c" line="2475"/>
         <source>Database query cobalt_visibility failed.
 </source>
         <translation>Database query cobalt_visibility mislukt.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2472"/>
+        <location filename="../parse-xml.c" line="2482"/>
         <source>Database query cobalt_location failed.
 </source>
         <translation>Database query cobalt_location mislukt.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2479"/>
+        <location filename="../parse-xml.c" line="2489"/>
         <source>Database query cobalt_location (site) failed.
 </source>
         <translation>Database query cobalt_location (site) mislukt.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2486"/>
+        <location filename="../parse-xml.c" line="2496"/>
         <source>Database query cobalt_profile_sample failed.
 </source>
         <translation>Database query cobalt_profile_sample mislukt.
@@ -5796,17 +6042,17 @@ Maximum</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2168"/>
-        <location filename="../parse-xml.c" line="2189"/>
-        <location filename="../parse-xml.c" line="2508"/>
-        <location filename="../parse-xml.c" line="2527"/>
+        <location filename="../parse-xml.c" line="2178"/>
+        <location filename="../parse-xml.c" line="2199"/>
+        <location filename="../parse-xml.c" line="2518"/>
+        <location filename="../parse-xml.c" line="2537"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Database-query mislukt: &apos;%s&apos;
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2848"/>
+        <location filename="../parse-xml.c" line="2909"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Kan de stylesheet %s niet openen</translation>
     </message>
@@ -5816,161 +6062,167 @@ Maximum</translation>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="820"/>
+        <location filename="../planner.c" line="841"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Gas %s kan niet gevonden worden</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="356"/>
+        <location filename="../planner.c" line="363"/>
         <source>Too many gas mixes</source>
         <translation>Teveel gasmengsels</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="540"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation>Decompressieberekeningen gestopt omdat ze te lang duren</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="548"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation>gebaseerd op GFlow = %d en GFhigh = %d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="544"/>
+        <location filename="../planner.c" line="551"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface duikplan</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="548"/>
+        <location filename="../planner.c" line="555"/>
         <source>depth</source>
         <translation>diepte</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="558"/>
         <source>runtime</source>
         <translation>runtime</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="554"/>
+        <location filename="../planner.c" line="561"/>
         <source>duration</source>
         <translation>duur</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="557"/>
+        <location filename="../planner.c" line="564"/>
         <source>gas</source>
         <translation>gas</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="594"/>
+        <location filename="../planner.c" line="601"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Ga naar %.*f %s in %d:%02d min - runtime %d:%02u op %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="602"/>
+        <location filename="../planner.c" line="609"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Ga naar %.*f %s in %d:%02d min - runtime %d:%02u op %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="615"/>
+        <location filename="../planner.c" line="622"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Blijf op %.*f %s gedurende %d:%02d min - runtime %d:%02u op %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="622"/>
+        <location filename="../planner.c" line="629"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Blijf op %.*f %s gedurende %d:%02d min - runtime %d:%02u op %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="635"/>
+        <location filename="../planner.c" line="642"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="638"/>
-        <location filename="../planner.c" line="642"/>
+        <location filename="../planner.c" line="645"/>
+        <location filename="../planner.c" line="649"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="651"/>
+        <location filename="../planner.c" line="658"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="676"/>
+        <location filename="../planner.c" line="683"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Gaswissel naar %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="678"/>
+        <location filename="../planner.c" line="685"/>
         <source>Switch gas to %s</source>
         <translation>Gaswissel naar %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="697"/>
+        <location filename="../planner.c" line="704"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="699"/>
+        <location filename="../planner.c" line="706"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="710"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Gasverbruik (uitgezonderd CCR segmenten):</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="705"/>
+        <location filename="../planner.c" line="712"/>
         <source>Gas consumption:</source>
         <translation>Gasverbruik:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="535"/>
-        <location filename="../planner.c" line="725"/>
-        <location filename="../planner.c" line="730"/>
-        <location filename="../planner.c" line="753"/>
+        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="732"/>
+        <location filename="../planner.c" line="737"/>
+        <location filename="../planner.c" line="762"/>
+        <location filename="../planner.c" line="772"/>
         <source>Warning:</source>
         <translation>Waarschuwing:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="523"/>
+        <location filename="../planner.c" line="530"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
         <translation>NIET-AANSPRAKELIJKHEIDSVERKLARING / WAARSCHUWING: DIT IS EEN NIEUWE IMPLEMENTATIE VAN HET BUHLMANN ALGORITME EN EEN IMPLEMENTATIE VAN EEN DUIKPLANNER DIE HIEROP GEBASEERD IS. BEIDE IMPLEMENTATIES HEBBEN MAAR EEN BEPERKTE MATE VAN TESTEN ONDERGAAN. WIJ RADEN MET KLEM AF DUIKEN UIT TE VOEREN DIE GEBASEERD ZIJN OP DE RESULTATEN DIE HIER GETOOND WORDEN.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="726"/>
+        <location filename="../planner.c" line="733"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>dit is meer gas dan beschikbaar in de geselecteerde duikfles!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="731"/>
+        <location filename="../planner.c" line="738"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>niet genoeg reserve om gas te delen gedurende opstijging!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="733"/>
+        <location filename="../planner.c" line="740"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s van %s (%.0f%s/%.0f%s in geplande opstijging)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="735"/>
+        <location filename="../planner.c" line="742"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s gedurende geplande opstijging) van %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="759"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>hoge pO₂ waarde %.2f op %d:%02u met gas %s op diepte %.*f %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="1064"/>
+        <location filename="../planner.c" line="769"/>
+        <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="1085"/>
         <source>ean</source>
         <translation>EAN</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1099"/>
+        <location filename="../profile.c" line="1113"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -5979,70 +6231,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1102"/>
+        <location filename="../profile.c" line="1116"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1106"/>
+        <location filename="../profile.c" line="1120"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1112"/>
+        <location filename="../profile.c" line="1126"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1115"/>
+        <location filename="../profile.c" line="1129"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1117"/>
+        <location filename="../profile.c" line="1131"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1119"/>
+        <location filename="../profile.c" line="1133"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO₂%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1121"/>
+        <location filename="../profile.c" line="1135"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN₂%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1123"/>
+        <location filename="../profile.c" line="1137"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1140"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1147"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -6051,7 +6303,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1137"/>
+        <location filename="../profile.c" line="1151"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -6060,149 +6312,149 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1149"/>
+        <location filename="../profile.c" line="1163"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Veiligheidsstop: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1152"/>
+        <location filename="../profile.c" line="1166"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Veiligheidsstop: onbek tijd @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1157"/>
+        <location filename="../profile.c" line="1171"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1174"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: onbek tijd @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1178"/>
         <source>In deco
 </source>
         <translation>In deco
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1166"/>
+        <location filename="../profile.c" line="1180"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1183"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1172"/>
+        <location filename="../profile.c" line="1186"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %umin @ %.0f%s (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1180"/>
+        <location filename="../profile.c" line="1194"/>
         <source>In deco (calc)
 </source>
         <translation>In deco (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1196"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1185"/>
+        <location filename="../profile.c" line="1199"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1188"/>
+        <location filename="../profile.c" line="1202"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Berekend plafond %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1194"/>
+        <location filename="../profile.c" line="1208"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Compartiment %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1214"/>
         <source>heartbeat: %d
 </source>
         <translation>hartslag: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1202"/>
+        <location filename="../profile.c" line="1216"/>
         <source>bearing: %d
 </source>
         <translation>koers: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1205"/>
+        <location filename="../profile.c" line="1219"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>gemiddelde diepte tot nu toe %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1314"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1304"/>
-        <location filename="../profile.c" line="1308"/>
-        <location filename="../profile.c" line="1312"/>
+        <location filename="../profile.c" line="1318"/>
+        <location filename="../profile.c" line="1322"/>
+        <location filename="../profile.c" line="1326"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1316"/>
+        <location filename="../profile.c" line="1330"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1334"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1324"/>
-        <location filename="../profile.c" line="1328"/>
+        <location filename="../profile.c" line="1338"/>
+        <location filename="../profile.c" line="1342"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1335"/>
+        <location filename="../profile.c" line="1349"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -6333,6 +6585,7 @@ EADD: %d%s
     </message>
     <message>
         <location filename="../dive.c" line="30"/>
+        <location filename="../equipment.c" line="85"/>
         <source>oxygen</source>
         <translation>zuurstof</translation>
     </message>
@@ -6387,97 +6640,97 @@ EADD: %d%s
         <translation>(geen duiken)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sun</source>
         <translation>Zo</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Mon</source>
         <translation>Ma</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Tue</source>
         <translation>Di</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Wed</source>
         <translation>Wo</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Thu</source>
         <translation>Do</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Fri</source>
         <translation>Vr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sat</source>
         <translation>Za</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jan</source>
         <translation>jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Feb</source>
         <translation>feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Mar</source>
         <translation>mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Apr</source>
         <translation>apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>May</source>
         <translation>mei</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jun</source>
         <translation>jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Jul</source>
         <translation>jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Aug</source>
         <translation>aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Sep</source>
         <translation>sept</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Oct</source>
         <translation>okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Nov</source>
         <translation>nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Dec</source>
         <translation>dec</translation>
     </message>
@@ -7081,13 +7334,13 @@ Is de Uemis Zurich correkt aangesloten?</translation>
         <translation>Planning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
         <source>GF low</source>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>%</source>
         <translation>%</translation>
     </message>
@@ -7097,7 +7350,7 @@ Is de Uemis Zurich correkt aangesloten?</translation>
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="335"/>
         <source>Drop to first depth</source>
         <translation>Afdalen tot eerste dieptetrap</translation>
     </message>
@@ -7107,69 +7360,69 @@ Is de Uemis Zurich correkt aangesloten?</translation>
         <translation>Laatste stop op 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
         <source>Plan backgas breaks</source>
         <translation>Plan backgas pauzes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="355"/>
         <source>Gas options</source>
         <translation>Gas opties</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="376"/>
         <source>Bottom SAC</source>
         <translation>Gasverbruik (bodem)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="383"/>
         <source>Deco SAC</source>
         <translation>Gasverbruik (deco)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="380"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="390"/>
         <source>Bottom pO₂</source>
         <translation>Bodem pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="403"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="413"/>
         <source>Deco pO₂</source>
         <translation>Deco pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="449"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="462"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="478"/>
         <source>Dive notes</source>
         <translation>Duiknotities</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
         <source>Display runtime</source>
         <translation>Runtime tonen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <source>Display segment duration</source>
         <translation>Duur van het segment tonen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="531"/>
         <source>Display transitions in deco</source>
         <translation>Toon overgangen in deco</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="538"/>
         <source>Verbatim dive plan</source>
         <translation>Duikplan:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="387"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="410"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="397"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -7189,17 +7442,17 @@ Is de Uemis Zurich correkt aangesloten?</translation>
         <translation>6m tot oppervlakte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="499"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>Toon runtime (absolute tijd) van de pauzes in het duikplan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="515"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>Toon duur (relatieve tijd) van de pauzes in het duikplan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>Toon overgangen of beschouw hen als geïmpliceerd in het duikplan</translation>
     </message>
diff --git a/translations/subsurface_pl_PL.ts b/translations/subsurface_pl_PL.ts
index 2747b219a..d49bdc0bc 100644
--- a/translations/subsurface_pl_PL.ts
+++ b/translations/subsurface_pl_PL.ts
@@ -3,12 +3,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="539"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="522"/>
         <source>Person: </source>
         <translation>Osoba:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="540"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="523"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Wyszukiwanie partnerów i divemasterów</translation>
     </message>
@@ -16,40 +16,188 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="233"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="230"/>
         <source>No buddies</source>
         <translation>brak partnerów</translation>
     </message>
 </context>
 <context>
+    <name>ColumnNameProvider</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>GPS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Avg depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="210"/>
+        <location filename="../configuredivecomputer.cpp" line="212"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation>Nie można zapisać kopii pliku %1. Komunikat błędu: %2</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="226"/>
+        <location filename="../configuredivecomputer.cpp" line="228"/>
         <source>Could not open backup file: %1</source>
         <translation>Nie można otworzyć kopii zapasowej pliku : %1</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="542"/>
+        <location filename="../configuredivecomputer.cpp" line="552"/>
         <source>Dive computer details read successfully</source>
         <translation>Konfiguracja komputera odczytana poprawnie</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="551"/>
+        <location filename="../configuredivecomputer.cpp" line="561"/>
         <source>Setting successfully written to device</source>
         <translation>Pomyślnie zapisano ustawienia w urządzeniu</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="560"/>
+        <location filename="../configuredivecomputer.cpp" line="570"/>
         <source>Device firmware successfully updated</source>
         <translation>Oprogramowanie urządzenia pomyślnie zaktualizowane</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="569"/>
+        <location filename="../configuredivecomputer.cpp" line="579"/>
         <source>Device settings successfully reset</source>
         <translation>Ustawienie urządzenia pomyślnie zresetowane </translation>
     </message>
@@ -847,72 +995,72 @@
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1053"/>
         <source>Backup files (*.xml)</source>
         <translation>Pliki kopii zapasowych (*.xml)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1037"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>Wystąpił błąd podczas zapisywania pliku kopii zapasowej.
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1040"/>
         <source>Backup succeeded</source>
         <translation>Pomyślnie utworzono kopię zapasową.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1041"/>
         <source>Your settings have been saved to: %1</source>
         <translation>Twoje ustawienia zostały zapisane do: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1030"/>
         <source>Backup dive computer settings</source>
         <translation>Tworzy kopię ustawień komputera nurkowego</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1036"/>
         <source>XML backup error</source>
         <translation>Błąd kopii zapasowej XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1052"/>
         <source>Restore dive computer settings</source>
         <translation>Przywraca ustawienia komputera nurkowego</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1056"/>
         <source>XML restore error</source>
         <translation>Błąd przywracania XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1057"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>Wystąpił błąd podczas przywracania z pliku kopii zapasowej.
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1063"/>
         <source>Restore succeeded</source>
         <translation>Pomyślnie przywrócono ustawienia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1064"/>
         <source>Your settings have been restored successfully.</source>
         <translation>Twoje ustawienia zostały pomyślnie przywrócone.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1074"/>
         <source>Select firmware file</source>
         <translation>Wybierz plik z aktualizacją</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1075"/>
         <source>All files (*.*)</source>
         <translation>Wszystkie pliki (*.*)</translation>
     </message>
@@ -970,12 +1118,12 @@
         <translation>Kliknięcie tu usunie butlę z listy.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="410"/>
         <source>Cylinder cannot be removed</source>
         <translation>Butla nie może być usunięta.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="407"/>
+        <location filename="../qt-ui/models.cpp" line="411"/>
         <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>
@@ -1051,12 +1199,12 @@
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="48"/>
         <source>Remove the selected dive computer?</source>
         <translation>Usunąć wybrany komputer nurkowy?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="49"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
         <translation>Czy na pewno chcesz usunąć
@@ -1071,22 +1219,22 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Model</source>
         <translation>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Device ID</source>
         <translation>ID urządzenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Nickname</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Kliknięcie tu usunie ten komputer nurkowy.</translation>
     </message>
@@ -1094,117 +1242,145 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="115"/>
         <source>Bailing out to OC</source>
         <translation>Przejście na obieg otwarty</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="117"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> początek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> koniec</translation>
     </message>
 </context>
 <context>
+    <name>DiveImportedModel</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="556"/>
+        <source>Date/time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
+        <source>Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>h:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>min</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1242"/>
+        <location filename="../qt-ui/models.cpp" line="1248"/>
         <source>#</source>
         <translation>Nr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1245"/>
+        <location filename="../qt-ui/models.cpp" line="1251"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1248"/>
+        <location filename="../qt-ui/models.cpp" line="1254"/>
         <source>Rating</source>
         <translation>Ocena</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Depth(%1)</source>
         <translation>Głębokość(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1254"/>
+        <location filename="../qt-ui/models.cpp" line="1260"/>
         <source>Duration</source>
         <translation>Czas trwania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1263"/>
         <source>Temp(%1%2)</source>
         <translation>Temperatura(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>Weight(%1)</source>
         <translation>Balast(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1263"/>
+        <location filename="../qt-ui/models.cpp" line="1269"/>
         <source>Suit</source>
         <translation>Skafander</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1266"/>
+        <location filename="../qt-ui/models.cpp" line="1272"/>
         <source>Cyl</source>
         <translation>Butle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1269"/>
+        <location filename="../qt-ui/models.cpp" line="1275"/>
         <source>Gas</source>
         <translation>Gaz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1277"/>
+        <location filename="../qt-ui/models.cpp" line="1283"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1280"/>
+        <location filename="../qt-ui/models.cpp" line="1286"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1283"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>Location</source>
         <translation>Miejsce</translation>
     </message>
@@ -1212,87 +1388,87 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="787"/>
+        <location filename="../qt-ui/divelistview.cpp" line="768"/>
         <source>Expand all</source>
         <translation>Rozwiń wszystkie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="788"/>
+        <location filename="../qt-ui/divelistview.cpp" line="769"/>
         <source>Collapse all</source>
         <translation>Zwiń wszystkie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="789"/>
+        <location filename="../qt-ui/divelistview.cpp" line="770"/>
         <source>Collapse others</source>
         <translation>Zwiń pozostałe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="791"/>
+        <location filename="../qt-ui/divelistview.cpp" line="772"/>
         <source>Remove dive(s) from trip</source>
         <translation>Usuń nurkowanie(a) z grupy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="792"/>
+        <location filename="../qt-ui/divelistview.cpp" line="773"/>
         <source>Create new trip above</source>
         <translation>Utwórz nową grupę powyżej</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="806"/>
+        <location filename="../qt-ui/divelistview.cpp" line="787"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Dodaj nurkowanie(a) do grupy powyżej</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="808"/>
+        <location filename="../qt-ui/divelistview.cpp" line="789"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Dodaj nurkowanie(a) do grupy poniżej</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="812"/>
+        <location filename="../qt-ui/divelistview.cpp" line="793"/>
         <source>Merge trip with trip above</source>
         <translation>Połącz grupę z grupą powyżej</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="813"/>
+        <location filename="../qt-ui/divelistview.cpp" line="794"/>
         <source>Merge trip with trip below</source>
         <translation>Połącz grupę z grupą poniżej</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="817"/>
+        <location filename="../qt-ui/divelistview.cpp" line="798"/>
         <source>Delete dive(s)</source>
         <translation>Usuń nurkowanie(a)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="819"/>
+        <location filename="../qt-ui/divelistview.cpp" line="800"/>
         <source>Mark dive(s) invalid</source>
         <translation>Oznacz nurkowanie(a) jak niepoprawne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="823"/>
+        <location filename="../qt-ui/divelistview.cpp" line="804"/>
         <source>Merge selected dives</source>
         <translation>Połącz wybrane nurkowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="825"/>
+        <location filename="../qt-ui/divelistview.cpp" line="806"/>
         <source>Renumber dive(s)</source>
         <translation>Zmień numerację</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="826"/>
+        <location filename="../qt-ui/divelistview.cpp" line="807"/>
         <source>Shift times</source>
         <translation>Zmień czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="827"/>
+        <location filename="../qt-ui/divelistview.cpp" line="808"/>
         <source>Load images</source>
         <translation>Dodaj zdjęcia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Open image files</source>
         <translation>Dodawanie zdjęć</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Pliki graficzne (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -1477,100 +1653,100 @@ wybrany komputer nurkowy?</translation>
         <translation>Piasek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>Pliki UDDF  (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="268"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>pliki CSV (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="68"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Format używany do wymiany danych pomiędzy różnorodnymi programami związanymi z nurkowaniem.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>Lista oddzielonych przecinkami danych opisujących profil nurkowania. </translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation>Lista oddzielonych przecinkami najważniejszych informacji z  nurkowania. Nie obejmuje to profilu nurkowania.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Wysyła dane na stronę divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>Wysyła dane do strony dive-share.appspot.com</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>Eksport danych o miejscach nurkowych w HTML z zaznaczeniem ich na mapie świata. </translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
         <source>Subsurface native XML format.</source>
         <translation>Format XML używany przez Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
         <source>Write depths of images to file.</source>
         <translation>Zapisuje głębokości zdjęć do pliku.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export UDDF file as</source>
         <translation>Eksportuj plik UDDF jako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="267"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
         <source>Export CSV file as</source>
         <translation>Eksportuj plik CSV jako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="278"/>
         <source>Export world map</source>
         <translation>Eksport mapy świata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="299"/>
         <source>HTML files (*.html)</source>
         <translation>Pliki HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="283"/>
         <source>Export Subsurface XML</source>
         <translation>Eksport Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="284"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>Pliki XML (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
         <source>Save image depths</source>
         <translation>Zapisz głębokości zdjeć</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="298"/>
         <source>Export HTML files as</source>
         <translation>Eksportuj pliki HTML jako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
         <source>Can&apos;t open file %s</source>
         <translation>Nie można otworzyć pliku %s</translation>
     </message>
@@ -1583,248 +1759,228 @@ wybrany komputer nurkowy?</translation>
         <translation>Importowanie logów nurkowych</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
-        <source>CSV options</source>
-        <translation>Opcje CVS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="281"/>
-        <source>Pre-configured imports</source>
-        <translation>Predefiniowane konfiguracje</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="122"/>
-        <source>Depth</source>
-        <translation>Głębokość</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="142"/>
-        <source>Stopdepth</source>
-        <translation>Przystanek</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="162"/>
-        <source>Pressure</source>
-        <translation>Ciśnienie</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="176"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="466"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
         <source>Time</source>
         <translation>Czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="183"/>
-        <source>Temp</source>
-        <translation>Temperatura</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="213"/>
-        <source>NDL</source>
-        <translation>NDL</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="233"/>
-        <source>TTS</source>
-        <translation>TTS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="253"/>
-        <source>Cns</source>
-        <translation>Cns</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="58"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="789"/>
-        <source>Field separator</source>
-        <translation>Separator danych</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="35"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="363"/>
-        <source>Units</source>
-        <translation>Jednostki</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="42"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="370"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="97"/>
         <source>Metric</source>
         <translation>Metryczny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="47"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="375"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="102"/>
         <source>Imperial</source>
         <translation>Imperialny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="169"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="298"/>
-        <source>Manual dives</source>
-        <translation>Nurkowania dodane ręcznie</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="316"/>
-        <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source>
-        <translation>Wybierz kolejność pól w formacie daty. Jako separator może być użyty dowolny ze znaków .-/.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="319"/>
-        <source>Date format</source>
-        <translation>Format daty</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="332"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="59"/>
         <source>dd.mm.yyyy</source>
         <translation>dd.mm.yyyy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="337"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="64"/>
         <source>mm/dd/yyyy</source>
         <translation>mm/dd/yyyy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="342"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="69"/>
         <source>yyyy-mm-dd</source>
         <translation>yyyy-mm-dd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="392"/>
-        <source>Dive #</source>
-        <translation>Nurkowanie nr</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="426"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="439"/>
-        <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source>
-        <translation>Data w formacie dd.mm.yyyy, yyyy-mm-dd lub mm/dd/yyyy</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+        <source>Dive #</source>
+        <translation>Nurkowanie nr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="429"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="500"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="513"/>
-        <source>Dive duration in seconds or in min:sec format</source>
-        <translation>Długość nurkowania w sekundach lub w formacie min:sek</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="503"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
         <source>Duration</source>
         <translation>Czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="574"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="591"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
         <source>Tags</source>
         <translation>Tagi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="608"/>
-        <source>Cyl size</source>
-        <translation>Rozmiar butli</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="625"/>
-        <source>Air temp</source>
-        <translation>Temperatura powietrza</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="642"/>
-        <source>Start Pressure</source>
-        <translation>Ciśnienie początkowe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="659"/>
-        <source>Water temp</source>
-        <translation>Temperatura wody</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="676"/>
-        <source>End Press</source>
-        <translation>Ciśnienie końcowe</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="693"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
         <source>O₂</source>
         <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="710"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
         <source>He</source>
         <translation>He</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="742"/>
-        <source>Choose duration format.</source>
-        <translation>Wybierz format czasu trwania.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="745"/>
-        <source>Duration format</source>
-        <translation>Format czasu trwania</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="758"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="78"/>
         <source>Seconds</source>
         <translation>sekundy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="763"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
         <source>Minutes</source>
         <translation>minuty</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="768"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="88"/>
         <source>Minutes:seconds</source>
         <translation>Minuty:sekundy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="540"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
         <source>Location</source>
         <translation>Miejsce</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="409"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
         <source>Max depth</source>
         <translation>Głębokość maksymalna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="386"/>
-        <source>Field configuration</source>
-        <translation>Konfiguracja pól</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+        <source>Tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+        <source>Samples pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
         <source>Mean depth</source>
         <translation>Głębokość średnia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="483"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
         <source>Buddy</source>
         <translation>Partner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="523"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
         <source>Notes</source>
         <translation>Opis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="557"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
         <source>Weight</source>
         <translation>Balast</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DivePlanner</name>
@@ -1867,42 +2023,42 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
         <source>unknown</source>
         <translation>nieznana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="691"/>
         <source>Final depth</source>
         <translation>Głębokość końcowa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="693"/>
         <source>Run time</source>
         <translation>Czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="701"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="695"/>
         <source>Duration</source>
         <translation>Czas trwania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="703"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
         <source>Used gas</source>
         <translation>Używany gaz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="705"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
         <source>CC set point</source>
         <translation>CC set point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1044"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1051"/>
         <source>Discard the plan?</source>
         <translation>Porzucić plan?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1045"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1052"/>
         <source>You are about to discard your plan.</source>
         <translation>Masz zamiar porzucić plan</translation>
     </message>
@@ -1910,22 +2066,22 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="257"/>
         <source>Dive planner points</source>
         <translation>Plan nurkowy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="261"/>
         <source>Available gases</source>
         <translation>Dostępne gazy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="284"/>
         <source>Add dive data point</source>
         <translation>dodaj punkt do profilu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="304"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="293"/>
         <source>Save new</source>
         <translation>Zapisz nowy</translation>
     </message>
@@ -1933,92 +2089,112 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Depth</source>
         <translation>Głębokość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
         <source>Time</source>
         <translation>Czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
         <source>Pressure</source>
         <translation>Ciśnienie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
         <source>Color</source>
         <translation>Kolor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
         <source>Pressure S</source>
         <translation>Ciśnienie S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
+        <source>Setpoint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
+        <source>Sensor1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
+        <source>Sensor2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
+        <source>Sensor3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
         <source>Ambient pressure</source>
         <translation>Cisnienie otoczenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
-        <source>Heart Beat</source>
-        <translation>Tętno</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
+        <source>Heart beat</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
-        <source>Gradient Factor</source>
-        <translation>Gradient Factor</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/>
+        <source>Gradient factor</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
-        <source>Mean Depth/s</source>
-        <translation>Głębokość średnia/s</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
+        <source>Mean depth/s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
         <source>Pressure I</source>
         <translation>Ciśnienie I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
         <source>User entered</source>
         <translation>Podane przez użytkownika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
         <source>Cylinder index</source>
         <translation>Numer butli</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
         <source>Ceiling</source>
         <translation>Sufit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
@@ -2069,127 +2245,127 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1437"/>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1443"/>
+        <location filename="../qt-ui/models.cpp" line="1489"/>
         <source>#</source>
         <translation>Nr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1440"/>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1492"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1443"/>
-        <location filename="../qt-ui/models.cpp" line="1489"/>
+        <location filename="../qt-ui/models.cpp" line="1449"/>
+        <location filename="../qt-ui/models.cpp" line="1495"/>
         <source>Rating</source>
         <translation>Ocena</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1452"/>
         <source>Depth</source>
         <translation>Głębokość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1458"/>
         <source>Temp</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1461"/>
         <source>Weight</source>
         <translation>Balast</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>Weight(%1)</source>
         <translation>Balast(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1458"/>
-        <location filename="../qt-ui/models.cpp" line="1504"/>
+        <location filename="../qt-ui/models.cpp" line="1464"/>
+        <location filename="../qt-ui/models.cpp" line="1510"/>
         <source>Suit</source>
         <translation>Skafander</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1461"/>
-        <location filename="../qt-ui/models.cpp" line="1507"/>
+        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1513"/>
         <source>Cyl</source>
         <translation>Butle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1464"/>
-        <location filename="../qt-ui/models.cpp" line="1510"/>
+        <location filename="../qt-ui/models.cpp" line="1470"/>
+        <location filename="../qt-ui/models.cpp" line="1516"/>
         <source>Gas</source>
         <translation>Gaz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1473"/>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1527"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
-        <location filename="../qt-ui/models.cpp" line="1524"/>
+        <location filename="../qt-ui/models.cpp" line="1482"/>
+        <location filename="../qt-ui/models.cpp" line="1530"/>
         <source>Location</source>
         <translation>Miejsce</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>Depth(%1)</source>
         <translation>Głębokość(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1449"/>
-        <location filename="../qt-ui/models.cpp" line="1495"/>
+        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1501"/>
         <source>Duration</source>
         <translation>Czas trwania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1498"/>
+        <location filename="../qt-ui/models.cpp" line="1504"/>
         <source>Temp(%1%2)</source>
         <translation>Temperatura(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1470"/>
-        <location filename="../qt-ui/models.cpp" line="1518"/>
+        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1524"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -2197,95 +2373,95 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="98"/>
         <source>no dives were selected</source>
         <translation>nie wybrano żadnych nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="117"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>nie udało się utworzyć pliku zip do wysłania: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="143"/>
         <source>cannot create temporary file: %s</source>
         <translation>nie można utworzyć pliku tymczasowego: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/>
         <source>internal error: %s</source>
         <translation>błąd wewnętrzny: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="169"/>
         <source>internal error</source>
         <translation>błąd wewnętrzny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="629"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="828"/>
         <source>Done</source>
         <translation>Zakończ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/>
         <source>Uploading dive list...</source>
         <translation>Wysyłanie listy nurkowań...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="692"/>
         <source>Downloading dive list...</source>
         <translation>Pobieranie listy nurkowań...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="741"/>
         <source>Downloading %1 dives...</source>
         <translation>Pobieranie %1 nurkowań...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="785"/>
         <source>Download finished - %1</source>
         <translation>Zakończono pobieranie - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="802"/>
         <source>Corrupted download</source>
         <translation>Pobrano uskodzone dane</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Archiwum nie mogło zostać otworzone:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
         <source>Upload failed</source>
         <translation>Wysyłanie nieudane</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/>
         <source>Upload successful</source>
         <translation>Wysyłanie zakończone sukcesem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
         <source>Login failed</source>
         <translation>Błąd logowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
         <source>Cannot parse response</source>
         <translation>Nie można przetworzyć odpowiedzi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
         <source>Error: %1</source>
         <translation>Błąd: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="829"/>
         <source>Upload finished</source>
         <translation>Wysyłanie zakończone</translation>
     </message>
@@ -2293,54 +2469,52 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="169"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="400"/>
         <source>Retry</source>
         <translation>Ponów</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="264"/>
         <source>Find Uemis dive computer</source>
         <translation>Wykryj komputer Uemis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Wybierz plik używany do logowania postępu pobierania danych</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Log files (*.log)</source>
         <translation>Pliki logów (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="362"/>
         <source>Warning</source>
         <translation>Ostrzeżenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="363"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>Użycie libdivecomputer w trybie diagnostycznym spowoduje, że pobrane nurkowania NIE ZOSTANĄ dodane do listy nurkowań.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="374"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Wybierz plik do którego zapisane zostaną dane binarne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="375"/>
         <source>Dump files (*.bin)</source>
         <translation>Pliki binarne (*.bin)</translation>
     </message>
@@ -2348,7 +2522,7 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="101"/>
         <source>Vendor</source>
         <translation>Producent</translation>
     </message>
@@ -2358,54 +2532,74 @@ wybrany komputer nurkowy?</translation>
         <translation>Pobierz z komputera nurkowego</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="31"/>
         <source>Device or mount point</source>
         <translation>Urządzenie lub punkt montowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="111"/>
         <source>Dive computer</source>
         <translation>Komputer nurkowy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="132"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="45"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="80"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="94"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="52"/>
         <source>Force download of all dives</source>
         <translation>Wymuś pobranie wszystkich nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
         <source>Always prefer downloaded dives</source>
         <translation>Pobrane dane mają priorytet </translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="189"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/>
+        <source>Downloaded Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
+        <source>Select all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
+        <source>Unselect all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
         <source>Save libdivecomputer logfile</source>
         <translation>Zapisz log postępu libdivecomputer </translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="87"/>
         <source>Save libdivecomputer dumpfile</source>
         <translation>Zapisz zrzut danych libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
         <source>Download into new trip</source>
         <translation>Dodaj do nowej grupy</translation>
     </message>
@@ -2413,12 +2607,12 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>ExtraDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Key</source>
         <translation>Klucz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Value</source>
         <translation>Wartość</translation>
     </message>
@@ -2432,21 +2626,20 @@ wybrany komputer nurkowy?</translation>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="245"/>
-        <source>Your dive profile was updated to facebook.</source>
-        <translation>Twój profil nurkowania został wysłany do Facebooka.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
-        <source>Photo Upload Failed</source>
-        <translation>Wysyłanie zdjęć nieudane</translation>
+        <source>Your dive profile was updated to Facebook.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="250"/>
-        <source>Your dive profile was not updated to facebook, 
+        <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
-        <translation>Twój profil nurkowania nie został wysłany do Facebooka.
-Prześlij proszę poniższą informację programistom Subsurface.</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+        <source>Photo Upload Failed</source>
+        <translation>Wysyłanie zdjęć nieudane</translation>
     </message>
 </context>
 <context>
@@ -2488,17 +2681,17 @@ Prześlij proszę poniższą informację programistom Subsurface.</translation>
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1544"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1621"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Ta opcja nie jest jeszcze dostępna dla wybranego komputera.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1624"/>
         <source>Firmware update failed!</source>
         <translation>Aktualizacja oprogramowania nieudana!</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1550"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1627"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Nie udało się połączyć z komputerem nurkowym.</translation>
     </message>
@@ -2506,7 +2699,7 @@ Prześlij proszę poniższą informację programistom Subsurface.</translation>
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="128"/>
+        <location filename="../qt-ui/globe.cpp" line="119"/>
         <source>Edit selected dive locations</source>
         <translation>Wskaż miejsce zaznaczonych nurkowań</translation>
     </message>
@@ -2514,7 +2707,7 @@ Prześlij proszę poniższą informację programistom Subsurface.</translation>
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="566"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="549"/>
         <source>Location: </source>
         <translation>Miejsce:</translation>
     </message>
@@ -2522,7 +2715,7 @@ Prześlij proszę poniższą informację programistom Subsurface.</translation>
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="286"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="283"/>
         <source>No location set</source>
         <translation>nie podano miejsca</translation>
     </message>
@@ -2530,331 +2723,336 @@ Prześlij proszę poniższą informację programistom Subsurface.</translation>
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="133"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
+        <location filename="../qt-ui/maintab.cpp" line="497"/>
         <source>Location</source>
         <translation>Miejsce</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="67"/>
         <source>Coordinates</source>
         <translation>Współrzędne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="169"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="154"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Buddy</source>
         <translation>Partner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="222"/>
+        <location filename="../qt-ui/maintab.ui" line="277"/>
         <source>Tags</source>
         <translation>Tagi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="186"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
         <source>Rating</source>
         <translation>Ocena</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="221"/>
         <source>Visibility</source>
         <translation>Widzialność</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="230"/>
         <source>Suit</source>
         <translation>Skafander</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="465"/>
+        <location filename="../qt-ui/maintab.cpp" line="470"/>
         <source>Dive notes</source>
         <translation>Notatki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
-        <location filename="../qt-ui/maintab.ui" line="648"/>
-        <location filename="../qt-ui/maintab.cpp" line="277"/>
+        <location filename="../qt-ui/maintab.ui" line="74"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="102"/>
+        <location filename="../qt-ui/maintab.ui" line="677"/>
+        <location filename="../qt-ui/maintab.cpp" line="279"/>
         <source>Air temp.</source>
         <translation>Temp. powietrza</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <location filename="../qt-ui/maintab.ui" line="667"/>
-        <location filename="../qt-ui/maintab.cpp" line="278"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.ui" line="696"/>
+        <location filename="../qt-ui/maintab.cpp" line="280"/>
         <source>Water temp.</source>
         <translation>Temp. wody</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="229"/>
-        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.ui" line="284"/>
+        <location filename="../qt-ui/maintab.cpp" line="498"/>
         <source>Notes</source>
         <translation>Opis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="369"/>
+        <location filename="../qt-ui/maintab.ui" line="398"/>
         <source>Equipment</source>
         <translation>Wyposażenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="496"/>
+        <location filename="../qt-ui/maintab.ui" line="525"/>
         <source>Gases used</source>
         <translation>Dostępne gazy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="515"/>
+        <location filename="../qt-ui/maintab.ui" line="544"/>
         <source>Gas consumed</source>
         <translation>Zużyty gaz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="553"/>
+        <location filename="../qt-ui/maintab.ui" line="582"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="591"/>
+        <location filename="../qt-ui/maintab.ui" line="620"/>
         <source>Max. depth</source>
         <translation>Maks. głębokość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="629"/>
+        <location filename="../qt-ui/maintab.ui" line="658"/>
         <source>Air pressure</source>
         <translation>Ciśn. atmosferyczne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="686"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>Dive time</source>
         <translation>Czas nurkowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="845"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
         <source>Total time</source>
         <translation>Całkowity czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="903"/>
+        <location filename="../qt-ui/maintab.ui" line="932"/>
         <source>Gas consumption</source>
         <translation>Zużycie gazu
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="962"/>
+        <location filename="../qt-ui/maintab.ui" line="991"/>
         <source>Extra data</source>
         <translation>Dodatkowe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="968"/>
+        <location filename="../qt-ui/maintab.ui" line="997"/>
         <source>Additional data from dive computer</source>
         <translation>Dodatkowe dane z komputera nurkowego</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="54"/>
-        <location filename="../qt-ui/maintab.ui" line="458"/>
+        <location filename="../qt-ui/maintab.ui" line="83"/>
+        <location filename="../qt-ui/maintab.ui" line="487"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="61"/>
+        <location filename="../qt-ui/maintab.ui" line="90"/>
         <source>Time</source>
         <translation>Czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="425"/>
+        <location filename="../qt-ui/maintab.ui" line="454"/>
         <source>Dive info</source>
         <translation>Informacje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="477"/>
+        <location filename="../qt-ui/maintab.ui" line="506"/>
         <source>Interval</source>
         <translation>Przerwa powierzchniowa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="534"/>
-        <location filename="../qt-ui/maintab.ui" line="799"/>
+        <location filename="../qt-ui/maintab.ui" line="563"/>
+        <location filename="../qt-ui/maintab.ui" line="828"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="610"/>
+        <location filename="../qt-ui/maintab.ui" line="639"/>
         <source>Avg. depth</source>
         <translation>Śr. głębokość </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="572"/>
+        <location filename="../qt-ui/maintab.ui" line="601"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="734"/>
         <source>Salinity</source>
         <translation>Zasolenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="742"/>
+        <location filename="../qt-ui/maintab.ui" line="771"/>
         <source>Stats</source>
         <translation>Statystyka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="775"/>
+        <location filename="../qt-ui/maintab.ui" line="804"/>
         <source>Depth</source>
         <translation>Głębokość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="787"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="813"/>
+        <location filename="../qt-ui/maintab.ui" line="842"/>
         <source>Duration</source>
         <translation>Czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="864"/>
+        <location filename="../qt-ui/maintab.ui" line="893"/>
         <source>Dives</source>
         <translation>Nurkowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="948"/>
+        <location filename="../qt-ui/maintab.ui" line="977"/>
         <source>Photos</source>
         <translation>Zdjęcia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="95"/>
+        <location filename="../qt-ui/maintab.cpp" line="87"/>
         <source>Cylinders</source>
         <translation>Butle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="99"/>
+        <location filename="../qt-ui/maintab.cpp" line="91"/>
         <source>Weights</source>
         <translation>Balast</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="55"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Apply changes</source>
         <translation>Zastosuj zmiany</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="59"/>
+        <location filename="../qt-ui/maintab.cpp" line="50"/>
         <source>Discard changes</source>
         <translation>Porzuć zmiany</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="96"/>
+        <location filename="../qt-ui/maintab.cpp" line="88"/>
         <source>Add cylinder</source>
         <translation>Dodaj butlę</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="100"/>
+        <location filename="../qt-ui/maintab.cpp" line="92"/>
         <source>Add weight system</source>
         <translation>Dodaj balast</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="274"/>
+        <location filename="../qt-ui/maintab.cpp" line="276"/>
         <source>Air temp. [%1]</source>
         <translation>Temp. powietrza [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="275"/>
+        <location filename="../qt-ui/maintab.cpp" line="277"/>
         <source>Water temp. [%1]</source>
         <translation>Temp. wody [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="312"/>
+        <location filename="../qt-ui/maintab.cpp" line="314"/>
         <source>This trip is being edited.</source>
         <translation>Ta grupa nurkowań jest obecnie edytowana.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="320"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Multiple dives are being edited.</source>
         <translation>Kilka nurkowań jest obecnie edytowanych.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.cpp" line="324"/>
         <source>This dive is being edited.</source>
         <translation>To nurkowanie jest obecnie edytowane.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="436"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
+        <location filename="../qt-ui/maintab.cpp" line="465"/>
         <source>Trip notes</source>
         <translation>Opis nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="458"/>
+        <location filename="../qt-ui/maintab.cpp" line="463"/>
         <source>Trip location</source>
         <translation>Miejsce nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="526"/>
-        <location filename="../qt-ui/maintab.cpp" line="558"/>
-        <location filename="../qt-ui/maintab.cpp" line="562"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
         <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="574"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="555"/>
+        <location filename="../qt-ui/maintab.cpp" line="563"/>
         <source>Deepest dive</source>
         <translation>Najgłębsze nurkowanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="556"/>
+        <location filename="../qt-ui/maintab.cpp" line="564"/>
         <source>Shallowest dive</source>
         <translation>Najpłytsze nurkowanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="569"/>
+        <location filename="../qt-ui/maintab.cpp" line="577"/>
         <source>Highest total SAC of a dive</source>
         <translation>Najwyższy SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="578"/>
         <source>Lowest total SAC of a dive</source>
         <translation>Najniższy SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="571"/>
+        <location filename="../qt-ui/maintab.cpp" line="579"/>
         <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="582"/>
+        <location filename="../qt-ui/maintab.cpp" line="590"/>
         <source>Highest temperature</source>
         <translation>Najwyższa temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="583"/>
+        <location filename="../qt-ui/maintab.cpp" line="591"/>
         <source>Lowest temperature</source>
         <translation>Najniższa temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="584"/>
+        <location filename="../qt-ui/maintab.cpp" line="592"/>
         <source>Average temperature of all selected dives</source>
         <translation>Średnia temperatura z wybranych nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="594"/>
+        <location filename="../qt-ui/maintab.cpp" line="602"/>
         <source>Longest dive</source>
         <translation>Najdłuższe nurkowanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="595"/>
+        <location filename="../qt-ui/maintab.cpp" line="603"/>
         <source>Shortest dive</source>
         <translation>Najkrótsze nurkowanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="596"/>
+        <location filename="../qt-ui/maintab.cpp" line="604"/>
         <source>Average length of all selected dives</source>
         <translation>Średnia długość wybranych nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="620"/>
+        <location filename="../qt-ui/maintab.cpp" line="628"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -2863,17 +3061,17 @@ z powietrza przy użyciu:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="624"/>
+        <location filename="../qt-ui/maintab.cpp" line="632"/>
         <source> and </source>
         <translation>oraz </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="911"/>
+        <location filename="../qt-ui/maintab.cpp" line="925"/>
         <source>Discard the changes?</source>
         <translation>Porzucić zmiany?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="912"/>
+        <location filename="../qt-ui/maintab.cpp" line="926"/>
         <source>You are about to discard your changes.</source>
         <translation>Masz zamiar porzucić zmiany.</translation>
     </message>
@@ -3020,7 +3218,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="296"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="232"/>
         <source>Open</source>
         <translation>Otwórz</translation>
     </message>
@@ -3380,90 +3578,90 @@ p, li { white-space: pre-wrap; }
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="252"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="229"/>
         <source>Open file</source>
         <translation>Otwórz plik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="256"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="233"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="332"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="309"/>
         <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="444"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
         <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="491"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
         <source>Print runtime table</source>
         <translation>Drukowanie planu nurkowego</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="834"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="811"/>
         <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="836"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="813"/>
         <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="841"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="818"/>
         <source>Save changes?</source>
         <translation>Zapisać zmiany?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1196"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1173"/>
         <source>Save file as</source>
         <translation>Zapisz plik jako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1337"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1314"/>
         <source>Open dive log file</source>
         <translation>Otwórz plik z logiem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="819"/>
         <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="300"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="444"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="277"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Warning</source>
         <translation>Ostrzeżenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1180"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1157"/>
         <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="625"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="602"/>
         <source>Yearly statistics</source>
         <translation>Statystyka roczna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1197"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1174"/>
         <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="1338"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1315"/>
         <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source>
         <translation>Logi nurkowe (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Pliki Cochran (*.can);;Pliki CSV (*.csv);;Pliki DiveLog.de (*.dld);;Pliki JDiveLog (*.jlb);;Pliki Liquivision (*.lvd);;Pliki MkVI (*.txt);;Pliki Suunto (*.sde *.db);;Pliki Divesoft (*.dlf);;Pliki UDDF/UDCF (*.uddf *.udcf);;Pliki XML (*.xml);;Wszystkie pliki (*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <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>
@@ -3471,7 +3669,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="651"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="634"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Filtr pokazuje %1 (z %2) nurkowań</translation>
     </message>
@@ -3479,12 +3677,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="239"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation>Możesz zaktualizować oprogramowanie w swoim komputerze nurkowym: masz wersję %1 a najnowsza stabilna wersja to %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="243"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
@@ -3493,27 +3691,27 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wykonaj na komputerze nurkowym te same kroki co przy przygotowywaniu się do zgrania danych z logbooka.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="244"/>
         <source>Not now</source>
         <translation>Nie teraz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="245"/>
         <source>Update firmware</source>
         <translation>Aktualizuj oprogramowanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
         <source>Firmware upgrade notice</source>
         <translation>Informacja o aktualizacji oprogramowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
         <source>Save the downloaded firmware as</source>
         <translation>Zapisz pobrany firmware jako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
         <source>HEX files (*.hex)</source>
         <translation>Pliki HEX (*.hex)</translation>
     </message>
@@ -3521,54 +3719,69 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Open circuit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="481"/>
         <source>Last stop at 20ft</source>
         <translation>Ostatni przystanek na gł. 20 stóp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="482"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% śr. głębokości do 20ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="489"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
         <source>20ft to surface</source>
         <translation>20ft do powierzchni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="485"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
         <source>Last stop at 6m</source>
         <translation>Ostatni przystanek na 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% śr. głębokości do 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="494"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
         <source>6m to surface</source>
         <translation>6m do powierzchni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="497"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="498"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
         <source>cuft/min</source>
         <translation>cuft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="506"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="507"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="500"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="501"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
@@ -3687,6 +3900,7 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="816"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -3721,57 +3935,87 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="795"/>
+        <source>CCR: Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="809"/>
+        <source>Default CCR set-point for dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="832"/>
+        <source>pSCR O₂ metabolism rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="839"/>
+        <source>pSCR ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="846"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="859"/>
+        <source>1:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="875"/>
         <source>System default</source>
         <translation>Domyślne ustawienia systemu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="843"/>
+        <location filename="../qt-ui/preferences.ui" line="914"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="849"/>
+        <location filename="../qt-ui/preferences.ui" line="920"/>
         <source>Proxy type</source>
         <translation>Rodzaj proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="862"/>
+        <location filename="../qt-ui/preferences.ui" line="933"/>
         <source>Host</source>
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="888"/>
+        <location filename="../qt-ui/preferences.ui" line="959"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="914"/>
+        <location filename="../qt-ui/preferences.ui" line="985"/>
         <source>Requires authentication</source>
         <translation>Wymaga autentykacji</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="934"/>
+        <location filename="../qt-ui/preferences.ui" line="1005"/>
         <source>Username</source>
         <translation>Użytkownik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="957"/>
+        <location filename="../qt-ui/preferences.ui" line="1028"/>
         <source>Password</source>
         <translation>Hasło</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="985"/>
-        <source>about:blank</source>
-        <translation>about:blank</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="1011"/>
-        <source>Disconnect from facebook</source>
-        <translation>Rozłącz z Facebook</translation>
+        <location filename="../qt-ui/preferences.ui" line="1079"/>
+        <source>Disconnect from Facebook</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="824"/>
+        <location filename="../qt-ui/preferences.ui" line="895"/>
         <source>Filter</source>
         <translation>Filtr</translation>
     </message>
@@ -3926,52 +4170,52 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="28"/>
+        <location filename="../qt-ui/preferences.cpp" line="44"/>
         <source>No proxy</source>
         <translation>Bez proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="29"/>
+        <location filename="../qt-ui/preferences.cpp" line="45"/>
         <source>System proxy</source>
         <translation>Systemowe proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="30"/>
+        <location filename="../qt-ui/preferences.cpp" line="46"/>
         <source>HTTP proxy</source>
         <translation>Proxy HTTP</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="31"/>
+        <location filename="../qt-ui/preferences.cpp" line="47"/>
         <source>SOCKS proxy</source>
         <translation>Proxy SOCKS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="291"/>
+        <location filename="../qt-ui/preferences.cpp" line="324"/>
         <source>Restart required</source>
         <translation>Wymagane ponowne uruchomienie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="292"/>
+        <location filename="../qt-ui/preferences.cpp" line="325"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>Aby użyć nowego języka musisz ponownie uruchomić Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="456"/>
+        <location filename="../qt-ui/preferences.cpp" line="494"/>
         <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
         <translation>Jeśli klikniesz OK, wszystkie ustawienia Subsurface zostaną przywrócone do ich wartości początkowych - z natychmiastowym skutkiem.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Pliki Subsurface XML  (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Open default log file</source>
         <translation>Otwórz domyślny plik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="455"/>
+        <location filename="../qt-ui/preferences.cpp" line="493"/>
         <source>Warning</source>
         <translation>Ostrzeżenie</translation>
     </message>
@@ -3979,17 +4223,17 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="91"/>
+        <location filename="../qt-ui/printdialog.cpp" line="85"/>
         <source>&amp;Preview</source>
         <translation>Podgląd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="88"/>
+        <location filename="../qt-ui/printdialog.cpp" line="82"/>
         <source>P&amp;rint</source>
         <translation>Drukuj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="103"/>
+        <location filename="../qt-ui/printdialog.cpp" line="97"/>
         <source>Print</source>
         <translation>Drukuj</translation>
     </message>
@@ -3997,42 +4241,42 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="20"/>
         <source>Dive#</source>
         <translation>Nurkowanie nr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="21"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="22"/>
         <source>Depth</source>
         <translation>Głębokość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="23"/>
         <source>Duration</source>
         <translation>Czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Master</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Buddy</source>
         <translation>Partner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="34"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Location</source>
         <translation>Miejsce</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <location filename="../qt-ui/printlayout.cpp" line="63"/>
         <source>Subsurface cannot find a usable printer on this system!</source>
         <translation>Subsurface nie może znaleźć drukarki!</translation>
     </message>
@@ -4098,72 +4342,72 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2095"/>
+        <location filename="../qt-ui/models.cpp" line="2101"/>
         <source>unknown</source>
         <translation>nieznana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2100"/>
+        <location filename="../qt-ui/models.cpp" line="2106"/>
         <source>Dive #%1 - %2</source>
         <translation>Nurkownie #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2103"/>
+        <location filename="../qt-ui/models.cpp" line="2109"/>
         <source>Max depth: %1 %2</source>
         <translation>Max głębokość: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2110"/>
+        <location filename="../qt-ui/models.cpp" line="2116"/>
         <source>Duration: %1 min</source>
         <translation>Czas: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2115"/>
+        <location filename="../qt-ui/models.cpp" line="2121"/>
         <source>Gas used:</source>
         <translation>Użyty gaz:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2117"/>
+        <location filename="../qt-ui/models.cpp" line="2123"/>
         <source>Tags:</source>
         <translation>Tagi:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2119"/>
+        <location filename="../qt-ui/models.cpp" line="2125"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2121"/>
+        <location filename="../qt-ui/models.cpp" line="2127"/>
         <source>Weights:</source>
         <translation>Balast:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2126"/>
+        <location filename="../qt-ui/models.cpp" line="2132"/>
         <source>Notes:</source>
         <translation>Opis:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2133"/>
+        <location filename="../qt-ui/models.cpp" line="2139"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2135"/>
+        <location filename="../qt-ui/models.cpp" line="2141"/>
         <source>Buddy:</source>
         <translation>Partner:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2137"/>
+        <location filename="../qt-ui/models.cpp" line="2143"/>
         <source>Suit:</source>
         <translation>Skafander:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2139"/>
+        <location filename="../qt-ui/models.cpp" line="2145"/>
         <source>Viz:</source>
         <translation>Widzialność:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2141"/>
+        <location filename="../qt-ui/models.cpp" line="2147"/>
         <source>Rating:</source>
         <translation>Ocena:</translation>
     </message>
@@ -4171,103 +4415,108 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="628"/>
         <source> (#%1 of %2)</source>
         <translation> (#%1 of %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="630"/>
+        <source>Unknown dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="647"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>Pokazywanie NDL / TTS zostało wyłączone z powodu zbyt długiego czasu obliczeń.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1168"/>
         <source>Make first divecomputer</source>
         <translation>Ustaw jako pierwszy komputer nurkowy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Delete this divecomputer</source>
         <translation>Usuń ten komputer nurkowy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1184"/>
         <source>Add gas change</source>
         <translation>Dodaj zmianę gazu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1187"/>
         <source> (Tank %1)</source>
         <translation> (Butla %1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1195"/>
         <source>Add set-point change</source>
         <translation>Dodaj zmianę set-point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1197"/>
         <source>Add bookmark</source>
         <translation>Dodaj notatkę</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
         <source>Remove event</source>
         <translation>Usuń znacznik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1206"/>
         <source>Hide similar events</source>
         <translation>Ukryj podobne znaczniki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1213"/>
         <source>Edit name</source>
         <translation>Zmień nazwę</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1242"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1249"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>Zmień ciśnienie w butli %1 (obecnie interpolowane jako %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1264"/>
         <source>Unhide all events</source>
         <translation>Odkryj wszystkie znaczniki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide events</source>
         <translation>Ukrywanie wydarzeń</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide all %1 events?</source>
         <translation>Ukyć wszystkie wydarzenia typu %1?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1333"/>
         <source>Remove the selected event?</source>
         <translation>Usunąć wybrane wydarzenie?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1334"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1424"/>
         <source>Edit name of bookmark</source>
         <translation>Zmień nazwę wydarzenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
         <source>Custom name:</source>
         <translation>Własna nazwa:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1430"/>
         <source>Name is too long!</source>
         <translation>Nazwa jest za długa!</translation>
     </message>
@@ -4275,102 +4524,102 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>AIR</source>
         <translation>POWIETRZE</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>OXYGEN</source>
         <translation>TLEN</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="208"/>
         <source>Remove this point</source>
         <translation>Usuń ten punkt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="57"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="42"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="25"/>
         <source>Average</source>
         <translation>średnia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="45"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="28"/>
         <source>Minimum</source>
         <translation>min.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="48"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="31"/>
         <source>Maximum</source>
         <translation>max.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="297"/>
+        <location filename="../qt-ui/globe.cpp" line="296"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>Przesuń mapę i wskaż lokalizację dwuklikiem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="525"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="526"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="550"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="551"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="570"/>
+        <location filename="../qt-ui/models.cpp" line="574"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="571"/>
+        <location filename="../qt-ui/models.cpp" line="575"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="595"/>
+        <location filename="../qt-ui/models.cpp" line="599"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="596"/>
+        <location filename="../qt-ui/models.cpp" line="600"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="513"/>
         <source>Invalid response from server</source>
         <translation>Niepoprawna odpowiedź z serwera</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation>Oczekiwano tagu XML &apos;DiveDateReader&apos;, zamiast tego odczytano &apos;%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="567"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation>Oczekiwany tag XML  &apos;DiveDates&apos; nie został znaleziony</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Uszkodzona odpowiedź XML. Linia  %1: %2</translation>
     </message>
@@ -4378,12 +4627,12 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1450"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1518"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Ta opcja nie jest jeszcze dostępna dla wybranego komputera.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1442"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Nie udało się połączyć z komputerem nurkowym.</translation>
     </message>
@@ -4397,12 +4646,12 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
-        <location filename="../qt-ui/simplewidgets.cpp" line="151"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="134"/>
         <source>New starting number</source>
         <translation>Nowy numer początkowy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="149"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="132"/>
         <source>New number</source>
         <translation>Nowy numer</translation>
     </message>
@@ -4410,12 +4659,12 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1575"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1653"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Ta opcja nie jest jeszcze dostępna dla wybranego komputera.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1579"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1657"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Nie udało się połączyć z komputerem nurkowym.</translation>
     </message>
@@ -4494,12 +4743,12 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
         <translation>Jaka data i godzina jest na zdjęciu?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="276"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="259"/>
         <source>Open image file</source>
         <translation>Otwórz zdjęcie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="278"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="261"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Pliki graficzne (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -4552,10 +4801,9 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
     <name>SocialNetworkDialog</name>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="282"/>
-        <source>Dive Date: %1 
+        <source>Dive date: %1 
 </source>
-        <translation>Data nurkowania: %1 
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="285"/>
@@ -4578,10 +4826,9 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="290"/>
-        <source>Dive Location: %1 
+        <source>Dive location: %1 
 </source>
-        <translation>Miejsce nurkowania: %1
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="293"/>
@@ -4699,47 +4946,47 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="329"/>
         <source>Webservice</source>
         <translation>Usługa Internetowa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="393"/>
         <source>Connecting...</source>
         <translation>Łączenie...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
         <source>Download finished</source>
         <translation>Pobieranie zakończone</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Download error: %1</source>
         <translation>Błąd pobierania: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="436"/>
         <source>Connection error: </source>
         <translation>Błąd połączenia:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
         <source>Download successful</source>
         <translation>Pobieranie zakończone sukcesem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="439"/>
         <source>Invalid user identifier!</source>
         <translation>Niepoprawny identyfikator użytkownika!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="312"/>
         <source>Enter User ID and click Download</source>
         <translation>Podaj ID użytkownika i wciśnij Pobierz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="442"/>
         <source>Cannot parse response!</source>
         <translation>Nie można przetworzyć odpowiedzi!</translation>
     </message>
@@ -4747,7 +4994,7 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="592"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="575"/>
         <source>Suits: </source>
         <translation>Skafandry:</translation>
     </message>
@@ -4755,7 +5002,7 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="119"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="116"/>
         <source>No suit set</source>
         <translation>nie podano skafandra</translation>
     </message>
@@ -4772,7 +5019,7 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="513"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="496"/>
         <source>Tags: </source>
         <translation>Tagi:</translation>
     </message>
@@ -4780,7 +5027,7 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="144"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="141"/>
         <source>Empty tags</source>
         <translation>brak tagów</translation>
     </message>
@@ -4788,17 +5035,17 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -4806,7 +5053,7 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="141"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="131"/>
         <source>Information</source>
         <translation>Informacje</translation>
     </message>
@@ -4814,7 +5061,7 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1090"/>
+        <location filename="../qt-ui/models.cpp" line="1094"/>
         <source> (%1 shown)</source>
         <translation> (%1 pokazane)</translation>
     </message>
@@ -4822,72 +5069,72 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="64"/>
         <source>Check for updates.</source>
         <translation>Sprawdzanie dostępności aktualizacji.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="66"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Nie udało się sprawdzić dostępności aktualizacji.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="70"/>
         <source>The following error occurred:</source>
         <translation>Natrafiono na następujący błąd:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="72"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
         <source>Please check your internet connection.</source>
         <translation>Sprawdź proszę swoje połączenie z Internetem.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="85"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="84"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>Używasz najnowszej wersji Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="88"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>Nowa wersja Subsurface jest dostępna.&lt;br/&gt;Kliknij na:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; aby ją pobrać.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="95"/>
         <source>A new version of Subsurface is available.</source>
         <translation>Nowsza wersja Subsurface jest dostępna.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="97"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
         <source>Latest version is %1, please check with your OS vendor for updates.</source>
         <translation>Najnowsza wersja to %1, sprawdź dostępność aktualizacji u dostawcy swojego systemu operacyjnego.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="103"/>
         <source>Newest release version is </source>
         <translation>Najnowsza wersja to </translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="105"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
         <source>The server returned the following information:</source>
         <translation>Serwer zwrócił następującą informację:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="121"/>
         <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation>Subsurface sprawdza dostępność nowej wersji co dwa tygodnie. Jeśli nie chcesz, żeby Subsurface kontynuował sprawdzanie kliknij Przestań.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
         <source>Decline</source>
         <translation>Przestań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="124"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
         <source>Accept</source>
         <translation>Zatwierdź</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="126"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="125"/>
         <source>Automatic check for updates</source>
         <translation>Automatyczne sprawdzanie aktualizacji </translation>
     </message>
@@ -4895,13 +5142,13 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>UserManual</name>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="55"/>
+        <location filename="../qt-ui/usermanual.cpp" line="54"/>
         <source>User Manual</source>
         <translation>instrukcja obsługi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="72"/>
-        <location filename="../qt-ui/usermanual.cpp" line="78"/>
+        <location filename="../qt-ui/usermanual.cpp" line="71"/>
+        <location filename="../qt-ui/usermanual.cpp" line="77"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Nie można znaleźć dokumentacji Subsurface</translation>
     </message>
@@ -4979,85 +5226,85 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
         <translation>Skąd pochodzą Twoje nurkowania?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
         <source>
 Operating System: %1</source>
         <translation>
 System Operacyjny: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 Architektura CPU: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 Language: %1</source>
         <translation>
 Język: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="93"/>
         <source>Should we ask you later?</source>
         <translation>Czy powinniśmy zapytać Cię ponownie?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Don&apos;t ask me again</source>
         <translation>Nie pytajcie mnie ponownie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Ask later</source>
         <translation>Zapytaj później</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
         <source>Submit user survey.</source>
         <translation>Wysyłanie ankiety.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask again?</source>
         <translation>Zapytać ponownie?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="17"/>
         <source>Send</source>
         <translation>Wyślij</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>
 Architektura OS CPU: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation>Subsurface nie był w stanie wysłać ankiety.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="121"/>
         <source>The following error occurred:</source>
         <translation>Natrafiono na następujący błąd:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>Please check your internet connection.</source>
         <translation>Sprawdź proszę swoje połączenie z Internetem.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="131"/>
         <source>Survey successfully submitted.</source>
         <translation>Ankieta pomyślnie wysłana.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="136"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation>Wystąpił błąd podczas sprawdzania dostępności aktualizacji.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -5065,12 +5312,12 @@ Architektura OS CPU: %1</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -5118,12 +5365,12 @@ Architektura OS CPU: %1</translation>
         <translation>Wyślij</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="247"/>
         <source>Operation timed out</source>
         <translation>Przekroczony czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="268"/>
         <source>Transferring data...</source>
         <translation>Transfer danych...</translation>
     </message>
@@ -5131,17 +5378,17 @@ Architektura OS CPU: %1</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Type</source>
         <translation>Rodzaj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Weight</source>
         <translation>Balast</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="496"/>
+        <location filename="../qt-ui/models.cpp" line="500"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Kliknięcie tu usunie balast z listy.</translation>
     </message>
@@ -5149,19 +5396,19 @@ Architektura OS CPU: %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1479"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1487"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1497"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1555"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1566"/>
         <source>Failed!</source>
         <translation>Niepowodzenie!</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1506"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1576"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Ta opcja nie jest jeszcze dostępna dla wybranego komputera.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1580"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Nie udało się połączyć z komputerem nurkowym.</translation>
     </message>
@@ -5169,74 +5416,74 @@ Architektura OS CPU: %1</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1841"/>
+        <location filename="../qt-ui/models.cpp" line="1847"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Rok 
  &gt; Miesiąc / grupa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1844"/>
+        <location filename="../qt-ui/models.cpp" line="1850"/>
         <source>#</source>
         <translation>Ilość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1847"/>
+        <location filename="../qt-ui/models.cpp" line="1853"/>
         <source>Duration 
  Total</source>
         <translation>Czas trwania
 całkowity</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1850"/>
+        <location filename="../qt-ui/models.cpp" line="1856"/>
         <source>
 Average</source>
         <translation>średni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1853"/>
+        <location filename="../qt-ui/models.cpp" line="1859"/>
         <source>
 Shortest</source>
         <translation>najkrótszy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1856"/>
+        <location filename="../qt-ui/models.cpp" line="1862"/>
         <source>
 Longest</source>
         <translation>najdłuższy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1859"/>
+        <location filename="../qt-ui/models.cpp" line="1865"/>
         <source>Depth (%1)
  Average</source>
         <translation>Głębokość (%1)
  średnia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1862"/>
-        <location filename="../qt-ui/models.cpp" line="1871"/>
-        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>
 Minimum</source>
         <translation>minimalna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1865"/>
-        <location filename="../qt-ui/models.cpp" line="1874"/>
-        <location filename="../qt-ui/models.cpp" line="1883"/>
+        <location filename="../qt-ui/models.cpp" line="1871"/>
+        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>
 Maximum</source>
         <translation>maksymalna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1874"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
  średni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1883"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temperatura (%1)
@@ -5317,40 +5564,40 @@ Maximum</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1508"/>
+        <location filename="../dive.c" line="1530"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) lub (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="464"/>
+        <location filename="../divelist.c" line="467"/>
         <location filename="../equipment.c" line="81"/>
-        <location filename="../planner.c" line="1060"/>
-        <location filename="../planner.c" line="1063"/>
+        <location filename="../planner.c" line="1081"/>
+        <location filename="../planner.c" line="1084"/>
         <source>air</source>
         <translation>powietrze</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="192"/>
+        <location filename="../equipment.c" line="194"/>
         <source>integrated</source>
         <translation>zintegrowany</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="193"/>
+        <location filename="../equipment.c" line="195"/>
         <source>belt</source>
         <translation>pas balastowy</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="194"/>
+        <location filename="../equipment.c" line="196"/>
         <source>ankle</source>
         <translation>na kostkach</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="195"/>
+        <location filename="../equipment.c" line="197"/>
         <source>backplate weight</source>
         <translation>na płycie</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="196"/>
+        <location filename="../equipment.c" line="198"/>
         <source>clip-on</source>
         <translation>doczepiany</translation>
     </message>
@@ -5358,7 +5605,7 @@ Maximum</source>
         <location filename="../file.c" line="112"/>
         <location filename="../file.c" line="434"/>
         <location filename="../file.c" line="506"/>
-        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="925"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Błąd odczytu &apos;%s&apos;</translation>
     </message>
@@ -5415,9 +5662,9 @@ Maximum</source>
         <translation>Nie znaleziono komputera nurkowego pasującego do pliku &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../file.c" line="869"/>
-        <location filename="../file.c" line="909"/>
-        <location filename="../file.c" line="1007"/>
+        <location filename="../file.c" line="870"/>
+        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="1016"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>Maksymalna ilość kolumn danych przy imporcie CSV to %d</translation>
     </message>
@@ -5588,27 +5835,27 @@ Maximum</source>
         <translation>niepoprawny znacznik</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="421"/>
+        <location filename="../libdivecomputer.c" line="419"/>
         <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="427"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Error registering the data</source>
         <translation>Błąd podczas przetwarzania danych</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="433"/>
         <source>Error parsing the datetime</source>
         <translation>Błąd podczas przetwarzania daty i czasu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Dive %d: %s</source>
         <translation>Nurkowanie %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="455"/>
+        <location filename="../libdivecomputer.c" line="454"/>
         <source>Error parsing the divetime</source>
         <translation>Błąd podczas przetwarzania czasu nurkowania</translation>
     </message>
@@ -5618,95 +5865,95 @@ Maximum</source>
         <translation>Błąd podczas przetwarzania głębokości</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="482"/>
+        <location filename="../libdivecomputer.c" line="483"/>
         <source>Error parsing temperature</source>
         <translation>Błąd przy przetwarzaniu temperatury</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="501"/>
+        <location filename="../libdivecomputer.c" line="503"/>
         <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="513"/>
+        <location filename="../libdivecomputer.c" line="515"/>
         <source>Error obtaining water salinity</source>
         <translation>Błąd podczas przetwarzania danych o zasoleniu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="521"/>
+        <location filename="../libdivecomputer.c" line="524"/>
         <source>Error obtaining surface pressure</source>
         <translation>Błąd podczas przetwarzania danych o cienieniu atmosferycznym</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="545"/>
+        <location filename="../libdivecomputer.c" line="549"/>
         <source>Error obtaining divemode</source>
         <translation>Błąd odczytywania trybu pracy komputera nurkowego </translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="562"/>
+        <location filename="../libdivecomputer.c" line="569"/>
         <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="569"/>
+        <location filename="../libdivecomputer.c" line="576"/>
         <source>Error parsing the samples</source>
         <translation>Błąd podczas przetwarzania próbek</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="706"/>
+        <location filename="../libdivecomputer.c" line="713"/>
         <source>Event: waiting for user action</source>
         <translation>Oczekiwanie na działanie użytkownika</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="714"/>
+        <location filename="../libdivecomputer.c" line="721"/>
         <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="778"/>
+        <location filename="../libdivecomputer.c" line="785"/>
         <source>Error registering the event handler.</source>
         <translation>Błąd rejestracji uchwytu (event handler)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="783"/>
+        <location filename="../libdivecomputer.c" line="790"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Błąd rejestracji uchwytu (cancellation handler)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="804"/>
+        <location filename="../libdivecomputer.c" line="811"/>
         <source>Dive data import error</source>
         <translation>Błąd podczas importowania danych</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="843"/>
+        <location filename="../libdivecomputer.c" line="850"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Nie można utworzyć kontekstu libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="850"/>
+        <location filename="../libdivecomputer.c" line="857"/>
         <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="858"/>
+        <location filename="../libdivecomputer.c" line="865"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Brak uprawnień by otworzyć urządzenie %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="506"/>
+        <location filename="../parse-xml.c" line="516"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Podejrzany skład procentowy %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1760"/>
+        <location filename="../parse-xml.c" line="1770"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Nie udało się przetworzyć &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1989"/>
-        <location filename="../parse-xml.c" line="2137"/>
+        <location filename="../parse-xml.c" line="1999"/>
+        <location filename="../parse-xml.c" line="2147"/>
         <source>Database query dm4_events failed.
 </source>
         <translation>Zapytanie bazy danych o dm4_events nie powiodło się.
@@ -5714,71 +5961,71 @@ Maximum</source>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1996"/>
-        <location filename="../parse-xml.c" line="2144"/>
+        <location filename="../parse-xml.c" line="2006"/>
+        <location filename="../parse-xml.c" line="2154"/>
         <source>Database query dm4_tags failed.
 </source>
         <translation>Zapytanie bazy danych o dm4_tags nie powiodło się.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2318"/>
+        <location filename="../parse-xml.c" line="2328"/>
         <source>Database query shearwater_cylinders failed.
 </source>
         <translation>Zapytanie bazy danych o shearwater_cylinders nie powiodło się.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2325"/>
+        <location filename="../parse-xml.c" line="2335"/>
         <source>Database query shearwater_changes failed.
 </source>
         <translation>Zapytanie bazy danych o shearwater_changes  nie powiodło się.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2332"/>
+        <location filename="../parse-xml.c" line="2342"/>
         <source>Database query shearwater_profile_sample failed.
 </source>
         <translation>Zapytanie bazy danych o shearwater_profile_sample nie powiodło się.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2451"/>
+        <location filename="../parse-xml.c" line="2461"/>
         <source>Database query cobalt_cylinders failed.
 </source>
         <translation>Zapytanie bazy danych o cobalt_cylinders nie powiodło się.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2458"/>
+        <location filename="../parse-xml.c" line="2468"/>
         <source>Database query cobalt_buddies failed.
 </source>
         <translation>Zapytanie bazy danych o cobalt_buddies nie powiodło się.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2465"/>
+        <location filename="../parse-xml.c" line="2475"/>
         <source>Database query cobalt_visibility failed.
 </source>
         <translation>Zapytanie bazy danych o cobalt_visibility nie powiodło się.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2472"/>
+        <location filename="../parse-xml.c" line="2482"/>
         <source>Database query cobalt_location failed.
 </source>
         <translation>Zapytanie bazy danych o cobalt_location nie powiodło się.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2479"/>
+        <location filename="../parse-xml.c" line="2489"/>
         <source>Database query cobalt_location (site) failed.
 </source>
         <translation>Zapytanie bazy danych o cobalt_location (site) nie powiodło się.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2486"/>
+        <location filename="../parse-xml.c" line="2496"/>
         <source>Database query cobalt_profile_sample failed.
 </source>
         <translation>Zapytanie bazy danych o cobalt_profile_sample nie powiodło się.
@@ -5792,17 +6039,17 @@ Maximum</source>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2168"/>
-        <location filename="../parse-xml.c" line="2189"/>
-        <location filename="../parse-xml.c" line="2508"/>
-        <location filename="../parse-xml.c" line="2527"/>
+        <location filename="../parse-xml.c" line="2178"/>
+        <location filename="../parse-xml.c" line="2199"/>
+        <location filename="../parse-xml.c" line="2518"/>
+        <location filename="../parse-xml.c" line="2537"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Błąd komunikacji z bazą danych &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2848"/>
+        <location filename="../parse-xml.c" line="2909"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Nie można otworzyć arkusza stylów %s</translation>
     </message>
@@ -5812,161 +6059,167 @@ Maximum</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="820"/>
+        <location filename="../planner.c" line="841"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Nie można znaleźć gazu %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="356"/>
+        <location filename="../planner.c" line="363"/>
         <source>Too many gas mixes</source>
         <translation>Zbyt wiele rodzajów gazu</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="540"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation>Obliczanie dekompresji przerwane z powodu zbyt długiego czasu.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="548"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation>w oparciu o GFlow = %d i GFhigh = %d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="544"/>
+        <location filename="../planner.c" line="551"/>
         <source>Subsurface dive plan</source>
         <translation>Plan nurkowania Subsurface </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="548"/>
+        <location filename="../planner.c" line="555"/>
         <source>depth</source>
         <translation>głębokość</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="558"/>
         <source>runtime</source>
         <translation>runtime</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="554"/>
+        <location filename="../planner.c" line="561"/>
         <source>duration</source>
         <translation>czas trwania</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="557"/>
+        <location filename="../planner.c" line="564"/>
         <source>gas</source>
         <translation>gaz</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="594"/>
+        <location filename="../planner.c" line="601"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Przejście do %.*f %s w %d:%02d min - runtime %d:%02u z %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="602"/>
+        <location filename="../planner.c" line="609"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Przejście do %.*f %s w %d:%02d min - runtime %d:%02u z %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="615"/>
+        <location filename="../planner.c" line="622"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Pozostań na %.*f %s przez %d:%02d min - runtime %d:%02u z %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="622"/>
+        <location filename="../planner.c" line="629"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Pozostań na %.*f %s przez %d:%02d min - runtime %d:%02u z %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="635"/>
+        <location filename="../planner.c" line="642"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="638"/>
-        <location filename="../planner.c" line="642"/>
+        <location filename="../planner.c" line="645"/>
+        <location filename="../planner.c" line="649"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="651"/>
+        <location filename="../planner.c" line="658"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="676"/>
+        <location filename="../planner.c" line="683"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Zmiana gazu na %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="678"/>
+        <location filename="../planner.c" line="685"/>
         <source>Switch gas to %s</source>
         <translation>Zmiana gazu na %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="697"/>
+        <location filename="../planner.c" line="704"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="699"/>
+        <location filename="../planner.c" line="706"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="710"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Zużycie gazu (nie uwzględnia CCR):</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="705"/>
+        <location filename="../planner.c" line="712"/>
         <source>Gas consumption:</source>
         <translation>Zużycie gazu:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="535"/>
-        <location filename="../planner.c" line="725"/>
-        <location filename="../planner.c" line="730"/>
-        <location filename="../planner.c" line="753"/>
+        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="732"/>
+        <location filename="../planner.c" line="737"/>
+        <location filename="../planner.c" line="762"/>
+        <location filename="../planner.c" line="772"/>
         <source>Warning:</source>
         <translation>Ostrzeżenie:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="523"/>
+        <location filename="../planner.c" line="530"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
         <translation>OSTRZEŻENIE: TEN PLANER POSŁUGUJE SIĘ IMPLEMENTACJĄ ALGORYTMU BUHLMANNA, KTÓRA JEST NOWA I ZOSTAŁA PRZETESTOWANA W BARDZO OGRANICZONYM ZAKRESIE. ZDECYDOWANIE ODRADZAMY PLANOWANIE NURKOWANIA JEDYNIE W OPARCIU O REZULTATY DZIAŁANIA TEGO PROGRAMU.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="726"/>
+        <location filename="../planner.c" line="733"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>to więcej gazu niż masz w dostępnych butlach!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="731"/>
+        <location filename="../planner.c" line="738"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>brak rezerwy na dzielenie się gazem z partnerem przy wynurzaniu!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="733"/>
+        <location filename="../planner.c" line="740"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s gazu %s (%.0f%s/%.0f%s podczas wynurzania)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="735"/>
+        <location filename="../planner.c" line="742"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s podczas wynurzania) gazu %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="759"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>wysoki pO₂ o wartości %.2f w %d:%02u przy użyciu %s na głębokości %.*f %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="1064"/>
+        <location filename="../planner.c" line="769"/>
+        <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="1085"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1099"/>
+        <location filename="../profile.c" line="1113"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -5975,70 +6228,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1102"/>
+        <location filename="../profile.c" line="1116"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1106"/>
+        <location filename="../profile.c" line="1120"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1112"/>
+        <location filename="../profile.c" line="1126"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1115"/>
+        <location filename="../profile.c" line="1129"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1117"/>
+        <location filename="../profile.c" line="1131"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1119"/>
+        <location filename="../profile.c" line="1133"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1121"/>
+        <location filename="../profile.c" line="1135"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1123"/>
+        <location filename="../profile.c" line="1137"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1140"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1147"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -6047,7 +6300,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1137"/>
+        <location filename="../profile.c" line="1151"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -6056,35 +6309,35 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1149"/>
+        <location filename="../profile.c" line="1163"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Przystanek bezp.: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1152"/>
+        <location filename="../profile.c" line="1166"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Przystanek bezp.: nieznany czas @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1157"/>
+        <location filename="../profile.c" line="1171"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1174"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: nieznany czas @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1178"/>
         <source>In deco
 </source>
         <translation>dekompresja
@@ -6092,114 +6345,114 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1166"/>
+        <location filename="../profile.c" line="1180"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1183"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1172"/>
+        <location filename="../profile.c" line="1186"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %umin @ %.0f%s (obliczone)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1180"/>
+        <location filename="../profile.c" line="1194"/>
         <source>In deco (calc)
 </source>
         <translation>dekompresja (obliczone)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1196"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1185"/>
+        <location filename="../profile.c" line="1199"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1188"/>
+        <location filename="../profile.c" line="1202"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Obliczony sufit:  %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1194"/>
+        <location filename="../profile.c" line="1208"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Tkanka %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1214"/>
         <source>heartbeat: %d
 </source>
         <translation>tętno: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1202"/>
+        <location filename="../profile.c" line="1216"/>
         <source>bearing: %d
 </source>
         <translation>kurs: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1205"/>
+        <location filename="../profile.c" line="1219"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>gł. średnia do teraz %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1314"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1304"/>
-        <location filename="../profile.c" line="1308"/>
-        <location filename="../profile.c" line="1312"/>
+        <location filename="../profile.c" line="1318"/>
+        <location filename="../profile.c" line="1322"/>
+        <location filename="../profile.c" line="1326"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sGł:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1316"/>
+        <location filename="../profile.c" line="1330"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sGł:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1334"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1324"/>
-        <location filename="../profile.c" line="1328"/>
+        <location filename="../profile.c" line="1338"/>
+        <location filename="../profile.c" line="1342"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1335"/>
+        <location filename="../profile.c" line="1349"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -6330,6 +6583,7 @@ EADD: %d%s
     </message>
     <message>
         <location filename="../dive.c" line="30"/>
+        <location filename="../equipment.c" line="85"/>
         <source>oxygen</source>
         <translation>tlen</translation>
     </message>
@@ -6384,97 +6638,97 @@ EADD: %d%s
         <translation>(brak nurkowań)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sun</source>
         <translation>Nie</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Mon</source>
         <translation>Pon</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Tue</source>
         <translation>Wto</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Wed</source>
         <translation>Śro</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Thu</source>
         <translation>Czw</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Fri</source>
         <translation>Pią</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sat</source>
         <translation>Sob</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jan</source>
         <translation>Sty</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Feb</source>
         <translation>Lut</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Apr</source>
         <translation>Kwi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>May</source>
         <translation>Maj</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jun</source>
         <translation>Cze</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Jul</source>
         <translation>Lip</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Aug</source>
         <translation>Sie</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Sep</source>
         <translation>Wrz</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Oct</source>
         <translation>Paź</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Nov</source>
         <translation>Lis</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Dec</source>
         <translation>Gru</translation>
     </message>
@@ -7078,13 +7332,13 @@ Czy Uemis Zurich jest podłączony poprawnie?</translation>
         <translation>Planowanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
         <source>GF low</source>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>%</source>
         <translation>%</translation>
     </message>
@@ -7094,7 +7348,7 @@ Czy Uemis Zurich jest podłączony poprawnie?</translation>
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="335"/>
         <source>Drop to first depth</source>
         <translation>Spadnij do pierwszej głębokości</translation>
     </message>
@@ -7104,69 +7358,69 @@ Czy Uemis Zurich jest podłączony poprawnie?</translation>
         <translation>Ostatni przystanek na 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
         <source>Plan backgas breaks</source>
         <translation>Przerwy powietrzne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="355"/>
         <source>Gas options</source>
         <translation>Ustawienia gazu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="376"/>
         <source>Bottom SAC</source>
         <translation>SAC przy dnie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="383"/>
         <source>Deco SAC</source>
         <translation>Deco SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="380"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="390"/>
         <source>Bottom pO₂</source>
         <translation>pO₂ przy dnie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="403"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="413"/>
         <source>Deco pO₂</source>
         <translation>pO₂ podczas deco</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="449"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="462"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="478"/>
         <source>Dive notes</source>
         <translation>Notatki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
         <source>Display runtime</source>
         <translation>Pokazuj runtime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <source>Display segment duration</source>
         <translation>Pokazuj czas trwania segmentu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="531"/>
         <source>Display transitions in deco</source>
         <translation>Pokazuj przejścia między przystankami</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="538"/>
         <source>Verbatim dive plan</source>
         <translation>Plan opisowy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="387"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="410"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="397"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -7186,17 +7440,17 @@ Czy Uemis Zurich jest podłączony poprawnie?</translation>
         <translation>6m do powierzchni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="499"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>Pokazuj runtime, czyli całkowity czas dla przystanku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="515"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>Pokazuj czas trwania (względny czas) przystanku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>Pokazuj lub ukrywaj listę przejść </translation>
     </message>
diff --git a/translations/subsurface_pt_BR.ts b/translations/subsurface_pt_BR.ts
index 9dfb8169d..cb4576a65 100644
--- a/translations/subsurface_pt_BR.ts
+++ b/translations/subsurface_pt_BR.ts
@@ -3,12 +3,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="539"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="522"/>
         <source>Person: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="540"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="523"/>
         <source>Searches for buddies and divemasters</source>
         <translation type="unfinished"/>
     </message>
@@ -16,40 +16,188 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="233"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="230"/>
         <source>No buddies</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>ColumnNameProvider</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>GPS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Avg depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="210"/>
+        <location filename="../configuredivecomputer.cpp" line="212"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="226"/>
+        <location filename="../configuredivecomputer.cpp" line="228"/>
         <source>Could not open backup file: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="542"/>
+        <location filename="../configuredivecomputer.cpp" line="552"/>
         <source>Dive computer details read successfully</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="551"/>
+        <location filename="../configuredivecomputer.cpp" line="561"/>
         <source>Setting successfully written to device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="560"/>
+        <location filename="../configuredivecomputer.cpp" line="570"/>
         <source>Device firmware successfully updated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="569"/>
+        <location filename="../configuredivecomputer.cpp" line="579"/>
         <source>Device settings successfully reset</source>
         <translation type="unfinished"/>
     </message>
@@ -847,70 +995,70 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1053"/>
         <source>Backup files (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1037"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1040"/>
         <source>Backup succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1041"/>
         <source>Your settings have been saved to: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1030"/>
         <source>Backup dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1036"/>
         <source>XML backup error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1052"/>
         <source>Restore dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1056"/>
         <source>XML restore error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1057"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1063"/>
         <source>Restore succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1064"/>
         <source>Your settings have been restored successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1074"/>
         <source>Select firmware file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1075"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -968,12 +1116,12 @@
         <translation>Ao clicar aqui irá eliminar este cilindro.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="410"/>
         <source>Cylinder cannot be removed</source>
         <translation>Cilindro não pode ser eliminado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="407"/>
+        <location filename="../qt-ui/models.cpp" line="411"/>
         <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>
@@ -1049,12 +1197,12 @@
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="48"/>
         <source>Remove the selected dive computer?</source>
         <translation>Remover o computador de mergulho selecionado?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="49"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
         <translation>Tem a certeza que deseja remover
@@ -1069,22 +1217,22 @@ o computador de mergulho selecionado?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Model</source>
         <translation>Modelo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Device ID</source>
         <translation>ID do dispositivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Nickname</source>
         <translation>Apelido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Clicar aqui removerá os computadores de mergulho</translation>
     </message>
@@ -1092,117 +1240,145 @@ o computador de mergulho selecionado?</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="115"/>
         <source>Bailing out to OC</source>
         <translation>Troca de emergência para circuito aberto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="117"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>início</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>fim</translation>
     </message>
 </context>
 <context>
+    <name>DiveImportedModel</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="556"/>
+        <source>Date/time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
+        <source>Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>h:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>min</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1242"/>
+        <location filename="../qt-ui/models.cpp" line="1248"/>
         <source>#</source>
         <translation>nº</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1245"/>
+        <location filename="../qt-ui/models.cpp" line="1251"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1248"/>
+        <location filename="../qt-ui/models.cpp" line="1254"/>
         <source>Rating</source>
         <translation>Classificação</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>ft</source>
         <translation>pé(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1254"/>
+        <location filename="../qt-ui/models.cpp" line="1260"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1263"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1263"/>
+        <location filename="../qt-ui/models.cpp" line="1269"/>
         <source>Suit</source>
         <translation>Roupa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1266"/>
+        <location filename="../qt-ui/models.cpp" line="1272"/>
         <source>Cyl</source>
         <translation>Cilindro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1269"/>
+        <location filename="../qt-ui/models.cpp" line="1275"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1277"/>
+        <location filename="../qt-ui/models.cpp" line="1283"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1280"/>
+        <location filename="../qt-ui/models.cpp" line="1286"/>
         <source>Max CNS</source>
         <translation>CNS Máximo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1283"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>Location</source>
         <translation>Local</translation>
     </message>
@@ -1210,87 +1386,87 @@ o computador de mergulho selecionado?</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="787"/>
+        <location filename="../qt-ui/divelistview.cpp" line="768"/>
         <source>Expand all</source>
         <translation>Expandir todos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="788"/>
+        <location filename="../qt-ui/divelistview.cpp" line="769"/>
         <source>Collapse all</source>
         <translation>Esconder todos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="789"/>
+        <location filename="../qt-ui/divelistview.cpp" line="770"/>
         <source>Collapse others</source>
         <translation>Esconder outros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="791"/>
+        <location filename="../qt-ui/divelistview.cpp" line="772"/>
         <source>Remove dive(s) from trip</source>
         <translation>Remover mergulhos de viagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="792"/>
+        <location filename="../qt-ui/divelistview.cpp" line="773"/>
         <source>Create new trip above</source>
         <translation>Criar viagem acima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="806"/>
+        <location filename="../qt-ui/divelistview.cpp" line="787"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Adicionar mergulhos para a viagem acima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="808"/>
+        <location filename="../qt-ui/divelistview.cpp" line="789"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Adicionar mergulhos para viagem abaixo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="812"/>
+        <location filename="../qt-ui/divelistview.cpp" line="793"/>
         <source>Merge trip with trip above</source>
         <translation>Juntar viagem com viagem acima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="813"/>
+        <location filename="../qt-ui/divelistview.cpp" line="794"/>
         <source>Merge trip with trip below</source>
         <translation>Juntar viagem com viagem abaixo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="817"/>
+        <location filename="../qt-ui/divelistview.cpp" line="798"/>
         <source>Delete dive(s)</source>
         <translation>Apagar mergulho(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="819"/>
+        <location filename="../qt-ui/divelistview.cpp" line="800"/>
         <source>Mark dive(s) invalid</source>
         <translation>Marcar megulho(s) como inválidos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="823"/>
+        <location filename="../qt-ui/divelistview.cpp" line="804"/>
         <source>Merge selected dives</source>
         <translation>Juntar mergulhos selecionados</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="825"/>
+        <location filename="../qt-ui/divelistview.cpp" line="806"/>
         <source>Renumber dive(s)</source>
         <translation>Renumerar mergulho(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="826"/>
+        <location filename="../qt-ui/divelistview.cpp" line="807"/>
         <source>Shift times</source>
         <translation>Deslocar tempo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="827"/>
+        <location filename="../qt-ui/divelistview.cpp" line="808"/>
         <source>Load images</source>
         <translation>Carregar imagens</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Open image files</source>
         <translation>Abrir imagens</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Imagens (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -1475,100 +1651,100 @@ o computador de mergulho selecionado?</translation>
         <translation>Areia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>Arquivos UDDF  (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="268"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>Arquivos CSV (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="68"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Formato genérico que é utilizado para troca de dados em uma variedade de programas de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Enviar os dados para o site do divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>Exportação HTML de pontos de mergulho visualizados no mundo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
         <source>Subsurface native XML format.</source>
         <translation>Formato nativo do Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
         <source>Write depths of images to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export UDDF file as</source>
         <translation>Exportar arquivo UDDF como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="267"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
         <source>Export CSV file as</source>
         <translation>Exportar arquivo CSV como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="278"/>
         <source>Export world map</source>
         <translation>Exportar mapa do mundo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="299"/>
         <source>HTML files (*.html)</source>
         <translation>Arquivos HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="283"/>
         <source>Export Subsurface XML</source>
         <translation>Exportar XML do Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="284"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>Arquivos XML (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
         <source>Save image depths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="298"/>
         <source>Export HTML files as</source>
         <translation>Exportar arquivo HTML como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
         <source>Can&apos;t open file %s</source>
         <translation>Não é possivel abrir o arquivo %s</translation>
     </message>
@@ -1581,248 +1757,228 @@ o computador de mergulho selecionado?</translation>
         <translation>Importar arquivo com log de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
-        <source>CSV options</source>
-        <translation>Opções CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="281"/>
-        <source>Pre-configured imports</source>
-        <translation>Importações pré-definidas</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="122"/>
-        <source>Depth</source>
-        <translation>Profundidade</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="142"/>
-        <source>Stopdepth</source>
-        <translation>Profundidade da parada</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="162"/>
-        <source>Pressure</source>
-        <translation>Pressão</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="176"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="466"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
         <source>Time</source>
         <translation>Horário</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="183"/>
-        <source>Temp</source>
-        <translation>Temp</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="213"/>
-        <source>NDL</source>
-        <translation>NDL</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="233"/>
-        <source>TTS</source>
-        <translation>TTS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="253"/>
-        <source>Cns</source>
-        <translation>CNS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="58"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="789"/>
-        <source>Field separator</source>
-        <translation>Separador de campo</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="35"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="363"/>
-        <source>Units</source>
-        <translation>Unidades</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="42"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="370"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="97"/>
         <source>Metric</source>
         <translation>Métrico</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="47"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="375"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="102"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="169"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="298"/>
-        <source>Manual dives</source>
-        <translation>Mergulhos manuais</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="316"/>
-        <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="319"/>
-        <source>Date format</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="332"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="59"/>
         <source>dd.mm.yyyy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="337"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="64"/>
         <source>mm/dd/yyyy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="342"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="69"/>
         <source>yyyy-mm-dd</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="392"/>
-        <source>Dive #</source>
-        <translation>Mergulho nº</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="426"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="439"/>
-        <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+        <source>Dive #</source>
+        <translation>Mergulho nº</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="429"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="500"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="513"/>
-        <source>Dive duration in seconds or in min:sec format</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="503"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="574"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
         <source>GPS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="591"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
         <source>Tags</source>
         <translation>Rótulos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="608"/>
-        <source>Cyl size</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+        <source>He</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="625"/>
-        <source>Air temp</source>
-        <translation>Temp ambiente</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="78"/>
+        <source>Seconds</source>
+        <translation>Segundos</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
+        <source>Minutes</source>
+        <translation>Minutos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="642"/>
-        <source>Start Pressure</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="88"/>
+        <source>Minutes:seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="659"/>
-        <source>Water temp</source>
-        <translation>Temp da água</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+        <source>Location</source>
+        <translation>Local</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="676"/>
-        <source>End Press</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+        <source>Max depth</source>
+        <translation>Profundidade máxima</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+        <source>Tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="693"/>
-        <source>O₂</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="710"/>
-        <source>He</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+        <source>Sample time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="742"/>
-        <source>Choose duration format.</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+        <source>Sample depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="745"/>
-        <source>Duration format</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+        <source>Sample temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="758"/>
-        <source>Seconds</source>
-        <translation>Segundos</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="763"/>
-        <source>Minutes</source>
-        <translation>Minutos</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="768"/>
-        <source>Minutes:seconds</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+        <source>Sample ndl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="540"/>
-        <source>Location</source>
-        <translation>Local</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="409"/>
-        <source>Max depth</source>
-        <translation>Profundidade máxima</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="386"/>
-        <source>Field configuration</source>
-        <translation>Configuração de campo</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+        <source>Samples pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
         <source>Mean depth</source>
         <translation>Profundidade média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="483"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
         <source>Buddy</source>
         <translation>Parceiro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="523"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="557"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DivePlanner</name>
@@ -1865,42 +2021,42 @@ o computador de mergulho selecionado?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="691"/>
         <source>Final depth</source>
         <translation>Profundidade final</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="693"/>
         <source>Run time</source>
         <translation>Tempo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="701"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="695"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="703"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
         <source>Used gas</source>
         <translation>Gás usado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="705"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
         <source>CC set point</source>
         <translation>ponto CC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1044"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1051"/>
         <source>Discard the plan?</source>
         <translation>Descartar o plano?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1045"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1052"/>
         <source>You are about to discard your plan.</source>
         <translation>Você está prestes a eliminar seu planejamento.</translation>
     </message>
@@ -1908,22 +2064,22 @@ o computador de mergulho selecionado?</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="257"/>
         <source>Dive planner points</source>
         <translation>Pontos planejados</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="261"/>
         <source>Available gases</source>
         <translation>Gases disponiveis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="284"/>
         <source>Add dive data point</source>
         <translation>Adicionar ponto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="304"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="293"/>
         <source>Save new</source>
         <translation type="unfinished"/>
     </message>
@@ -1931,92 +2087,112 @@ o computador de mergulho selecionado?</translation>
 <context>
     <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
         <source>Time</source>
         <translation>Horário</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
         <source>Pressure</source>
         <translation>Pressão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
         <source>Color</source>
         <translation>Cor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
         <source>Pressure S</source>
         <translation>Pressão S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
+        <source>Setpoint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
+        <source>Sensor1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
+        <source>Sensor2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
+        <source>Sensor3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
         <source>Ambient pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
-        <source>Heart Beat</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
+        <source>Heart beat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
-        <source>Gradient Factor</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/>
+        <source>Gradient factor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
-        <source>Mean Depth/s</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
+        <source>Mean depth/s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
         <source>Pressure I</source>
         <translation>Pressão I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
         <source>User entered</source>
         <translation>Entrado pelo usuário</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
         <source>Cylinder index</source>
         <translation>Indice do Cilindro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
         <source>Ceiling</source>
         <translation>Teto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
@@ -2067,127 +2243,127 @@ o computador de mergulho selecionado?</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1437"/>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1443"/>
+        <location filename="../qt-ui/models.cpp" line="1489"/>
         <source>#</source>
         <translation>nº</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1440"/>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1492"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1443"/>
-        <location filename="../qt-ui/models.cpp" line="1489"/>
+        <location filename="../qt-ui/models.cpp" line="1449"/>
+        <location filename="../qt-ui/models.cpp" line="1495"/>
         <source>Rating</source>
         <translation>Classificação</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1452"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1458"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1461"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>ft</source>
         <translation>pé(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1458"/>
-        <location filename="../qt-ui/models.cpp" line="1504"/>
+        <location filename="../qt-ui/models.cpp" line="1464"/>
+        <location filename="../qt-ui/models.cpp" line="1510"/>
         <source>Suit</source>
         <translation>Roupa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1461"/>
-        <location filename="../qt-ui/models.cpp" line="1507"/>
+        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1513"/>
         <source>Cyl</source>
         <translation>Cilindro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1464"/>
-        <location filename="../qt-ui/models.cpp" line="1510"/>
+        <location filename="../qt-ui/models.cpp" line="1470"/>
+        <location filename="../qt-ui/models.cpp" line="1516"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1473"/>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1527"/>
         <source>Max CNS</source>
         <translation>CNS Máximo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
-        <location filename="../qt-ui/models.cpp" line="1524"/>
+        <location filename="../qt-ui/models.cpp" line="1482"/>
+        <location filename="../qt-ui/models.cpp" line="1530"/>
         <source>Location</source>
         <translation>Local</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1449"/>
-        <location filename="../qt-ui/models.cpp" line="1495"/>
+        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1501"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1498"/>
+        <location filename="../qt-ui/models.cpp" line="1504"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1470"/>
-        <location filename="../qt-ui/models.cpp" line="1518"/>
+        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1524"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -2195,95 +2371,95 @@ o computador de mergulho selecionado?</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="98"/>
         <source>no dives were selected</source>
         <translation>nenhum mergulho selecionado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="117"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>falha ao criar arquivo zip para upload: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="143"/>
         <source>cannot create temporary file: %s</source>
         <translation>não foi possivel criar o arquivo temporário: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/>
         <source>internal error: %s</source>
         <translation>erro interno: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="169"/>
         <source>internal error</source>
         <translation>erro interno</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="629"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="828"/>
         <source>Done</source>
         <translation>Finalizado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/>
         <source>Uploading dive list...</source>
         <translation>Enviando lista de mergulhos...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="692"/>
         <source>Downloading dive list...</source>
         <translation>Recebendo lista de mergulhos...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="741"/>
         <source>Downloading %1 dives...</source>
         <translation>Recebendo %1 mergulhos...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="785"/>
         <source>Download finished - %1</source>
         <translation>Recebimento terminado - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="802"/>
         <source>Corrupted download</source>
         <translation>Recebimento inválido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>O arquivo não pode ser aberto:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
         <source>Upload failed</source>
         <translation>Envio falhou</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/>
         <source>Upload successful</source>
         <translation>Envio bem sucedido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
         <source>Login failed</source>
         <translation>Abertura de sessão (login) falhou</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
         <source>Cannot parse response</source>
         <translation>Falha na análise da resposta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
         <source>Error: %1</source>
         <translation>Erro: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="829"/>
         <source>Upload finished</source>
         <translation>Enviado finalizado</translation>
     </message>
@@ -2291,54 +2467,52 @@ o computador de mergulho selecionado?</translation>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="169"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="400"/>
         <source>Retry</source>
         <translation>Tentar novamente</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="264"/>
         <source>Find Uemis dive computer</source>
         <translation>Encontrar computador de mergulho Uemis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Escolha o arquivo para recebimento do arquivo de log do computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Log files (*.log)</source>
         <translation>Arquivos de log (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="362"/>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="363"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>Ao salvar a saída da biblioteca libdivecomputer as informações dos mergulhos recebidos NÃO serão gravadas na lista de mergulhos.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="374"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Escolha o arquivo onde gravar a saída binária do computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="375"/>
         <source>Dump files (*.bin)</source>
         <translation>Arquivos de saída (*.bin)</translation>
     </message>
@@ -2346,7 +2520,7 @@ o computador de mergulho selecionado?</translation>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="101"/>
         <source>Vendor</source>
         <translation>Fabricante</translation>
     </message>
@@ -2356,54 +2530,74 @@ o computador de mergulho selecionado?</translation>
         <translation>Download do Computador de Mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="31"/>
         <source>Device or mount point</source>
         <translation>Disco ou ponto de montágem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="111"/>
         <source>Dive computer</source>
         <translation>Computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="132"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="45"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="80"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="94"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="52"/>
         <source>Force download of all dives</source>
         <translation>Forçar recebimento de todos os mergulhos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
         <source>Always prefer downloaded dives</source>
         <translation>Sempre preferir mergulhos baixados</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="189"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/>
+        <source>Downloaded Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
+        <source>Select all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
+        <source>Unselect all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
         <source>Save libdivecomputer logfile</source>
         <translation>Salvar arquivo de log da biblioteca libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="87"/>
         <source>Save libdivecomputer dumpfile</source>
         <translation>Salvar arquivo de saída da biblioteca libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
         <source>Download into new trip</source>
         <translation type="unfinished"/>
     </message>
@@ -2411,12 +2605,12 @@ o computador de mergulho selecionado?</translation>
 <context>
     <name>ExtraDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Value</source>
         <translation type="unfinished"/>
     </message>
@@ -2430,21 +2624,21 @@ o computador de mergulho selecionado?</translation>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="245"/>
-        <source>Your dive profile was updated to facebook.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
-        <source>Photo Upload Failed</source>
+        <source>Your dive profile was updated to Facebook.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="250"/>
-        <source>Your dive profile was not updated to facebook, 
+        <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+        <source>Photo Upload Failed</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>FilterWidget</name>
@@ -2485,17 +2679,17 @@ o computador de mergulho selecionado?</translation>
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1544"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1621"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1624"/>
         <source>Firmware update failed!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1550"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1627"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -2503,7 +2697,7 @@ o computador de mergulho selecionado?</translation>
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="128"/>
+        <location filename="../qt-ui/globe.cpp" line="119"/>
         <source>Edit selected dive locations</source>
         <translation>Editar a localização dos mergulhos selecionados</translation>
     </message>
@@ -2511,7 +2705,7 @@ o computador de mergulho selecionado?</translation>
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="566"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="549"/>
         <source>Location: </source>
         <translation type="unfinished"/>
     </message>
@@ -2519,7 +2713,7 @@ o computador de mergulho selecionado?</translation>
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="286"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="283"/>
         <source>No location set</source>
         <translation type="unfinished"/>
     </message>
@@ -2527,330 +2721,335 @@ o computador de mergulho selecionado?</translation>
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="133"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
+        <location filename="../qt-ui/maintab.cpp" line="497"/>
         <source>Location</source>
         <translation>Local</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="67"/>
         <source>Coordinates</source>
         <translation>Coordenadas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="169"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="154"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Buddy</source>
         <translation>Parceiro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="222"/>
+        <location filename="../qt-ui/maintab.ui" line="277"/>
         <source>Tags</source>
         <translation>Rótulos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="186"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
         <source>Rating</source>
         <translation>Classificação</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="221"/>
         <source>Visibility</source>
         <translation>Visibilidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="230"/>
         <source>Suit</source>
         <translation>Roupa</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="465"/>
+        <location filename="../qt-ui/maintab.cpp" line="470"/>
         <source>Dive notes</source>
         <translation>Notas do mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
-        <location filename="../qt-ui/maintab.ui" line="648"/>
-        <location filename="../qt-ui/maintab.cpp" line="277"/>
+        <location filename="../qt-ui/maintab.ui" line="74"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="102"/>
+        <location filename="../qt-ui/maintab.ui" line="677"/>
+        <location filename="../qt-ui/maintab.cpp" line="279"/>
         <source>Air temp.</source>
         <translation>Temperatura do ar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <location filename="../qt-ui/maintab.ui" line="667"/>
-        <location filename="../qt-ui/maintab.cpp" line="278"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.ui" line="696"/>
+        <location filename="../qt-ui/maintab.cpp" line="280"/>
         <source>Water temp.</source>
         <translation>Temperatura da água</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="229"/>
-        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.ui" line="284"/>
+        <location filename="../qt-ui/maintab.cpp" line="498"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="369"/>
+        <location filename="../qt-ui/maintab.ui" line="398"/>
         <source>Equipment</source>
         <translation>Equipamento</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="496"/>
+        <location filename="../qt-ui/maintab.ui" line="525"/>
         <source>Gases used</source>
         <translation>Gases utilizados</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="515"/>
+        <location filename="../qt-ui/maintab.ui" line="544"/>
         <source>Gas consumed</source>
         <translation>Gas consumido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="553"/>
+        <location filename="../qt-ui/maintab.ui" line="582"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="591"/>
+        <location filename="../qt-ui/maintab.ui" line="620"/>
         <source>Max. depth</source>
         <translation>Profundidade máxima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="629"/>
+        <location filename="../qt-ui/maintab.ui" line="658"/>
         <source>Air pressure</source>
         <translation>Pressão do ar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="686"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>Dive time</source>
         <translation>Tempo de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="845"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
         <source>Total time</source>
         <translation>Tempo total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="903"/>
+        <location filename="../qt-ui/maintab.ui" line="932"/>
         <source>Gas consumption</source>
         <translation>Consumo de gás</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="962"/>
+        <location filename="../qt-ui/maintab.ui" line="991"/>
         <source>Extra data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="968"/>
+        <location filename="../qt-ui/maintab.ui" line="997"/>
         <source>Additional data from dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="54"/>
-        <location filename="../qt-ui/maintab.ui" line="458"/>
+        <location filename="../qt-ui/maintab.ui" line="83"/>
+        <location filename="../qt-ui/maintab.ui" line="487"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="61"/>
+        <location filename="../qt-ui/maintab.ui" line="90"/>
         <source>Time</source>
         <translation>Horário</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="425"/>
+        <location filename="../qt-ui/maintab.ui" line="454"/>
         <source>Dive info</source>
         <translation>Informações do Mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="477"/>
+        <location filename="../qt-ui/maintab.ui" line="506"/>
         <source>Interval</source>
         <translation>Intervalo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="534"/>
-        <location filename="../qt-ui/maintab.ui" line="799"/>
+        <location filename="../qt-ui/maintab.ui" line="563"/>
+        <location filename="../qt-ui/maintab.ui" line="828"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="610"/>
+        <location filename="../qt-ui/maintab.ui" line="639"/>
         <source>Avg. depth</source>
         <translation>Profundidade Média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="572"/>
+        <location filename="../qt-ui/maintab.ui" line="601"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="734"/>
         <source>Salinity</source>
         <translation>Salinidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="742"/>
+        <location filename="../qt-ui/maintab.ui" line="771"/>
         <source>Stats</source>
         <translation>Estatísticas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="775"/>
+        <location filename="../qt-ui/maintab.ui" line="804"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="787"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="813"/>
+        <location filename="../qt-ui/maintab.ui" line="842"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="864"/>
+        <location filename="../qt-ui/maintab.ui" line="893"/>
         <source>Dives</source>
         <translation>Mergulhos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="948"/>
+        <location filename="../qt-ui/maintab.ui" line="977"/>
         <source>Photos</source>
         <translation>Fotos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="95"/>
+        <location filename="../qt-ui/maintab.cpp" line="87"/>
         <source>Cylinders</source>
         <translation>Cilindros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="99"/>
+        <location filename="../qt-ui/maintab.cpp" line="91"/>
         <source>Weights</source>
         <translation>Lastro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="55"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Apply changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="59"/>
+        <location filename="../qt-ui/maintab.cpp" line="50"/>
         <source>Discard changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="96"/>
+        <location filename="../qt-ui/maintab.cpp" line="88"/>
         <source>Add cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="100"/>
+        <location filename="../qt-ui/maintab.cpp" line="92"/>
         <source>Add weight system</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="274"/>
+        <location filename="../qt-ui/maintab.cpp" line="276"/>
         <source>Air temp. [%1]</source>
         <translation>Temperatura do Ar [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="275"/>
+        <location filename="../qt-ui/maintab.cpp" line="277"/>
         <source>Water temp. [%1]</source>
         <translation>Temperatura da água [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="312"/>
+        <location filename="../qt-ui/maintab.cpp" line="314"/>
         <source>This trip is being edited.</source>
         <translation>Esta viagem está sendo editada.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="320"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Multiple dives are being edited.</source>
         <translation>Vários mergulhos estão sendo editados.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.cpp" line="324"/>
         <source>This dive is being edited.</source>
         <translation>Este mergulho está sendo editado.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="436"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
+        <location filename="../qt-ui/maintab.cpp" line="465"/>
         <source>Trip notes</source>
         <translation>Notas da viagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="458"/>
+        <location filename="../qt-ui/maintab.cpp" line="463"/>
         <source>Trip location</source>
         <translation>Local do mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="526"/>
-        <location filename="../qt-ui/maintab.cpp" line="558"/>
-        <location filename="../qt-ui/maintab.cpp" line="562"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
         <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="574"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="555"/>
+        <location filename="../qt-ui/maintab.cpp" line="563"/>
         <source>Deepest dive</source>
         <translation>Mergulho mais profundo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="556"/>
+        <location filename="../qt-ui/maintab.cpp" line="564"/>
         <source>Shallowest dive</source>
         <translation>Mergulho mais raso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="569"/>
+        <location filename="../qt-ui/maintab.cpp" line="577"/>
         <source>Highest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="578"/>
         <source>Lowest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="571"/>
+        <location filename="../qt-ui/maintab.cpp" line="579"/>
         <source>Average total SAC of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="582"/>
+        <location filename="../qt-ui/maintab.cpp" line="590"/>
         <source>Highest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="583"/>
+        <location filename="../qt-ui/maintab.cpp" line="591"/>
         <source>Lowest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="584"/>
+        <location filename="../qt-ui/maintab.cpp" line="592"/>
         <source>Average temperature of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="594"/>
+        <location filename="../qt-ui/maintab.cpp" line="602"/>
         <source>Longest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="595"/>
+        <location filename="../qt-ui/maintab.cpp" line="603"/>
         <source>Shortest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="596"/>
+        <location filename="../qt-ui/maintab.cpp" line="604"/>
         <source>Average length of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="620"/>
+        <location filename="../qt-ui/maintab.cpp" line="628"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -2859,17 +3058,17 @@ misturados com ar usando:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="624"/>
+        <location filename="../qt-ui/maintab.cpp" line="632"/>
         <source> and </source>
         <translation>e</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="911"/>
+        <location filename="../qt-ui/maintab.cpp" line="925"/>
         <source>Discard the changes?</source>
         <translation>Descartar alterações?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="912"/>
+        <location filename="../qt-ui/maintab.cpp" line="926"/>
         <source>You are about to discard your changes.</source>
         <translation>Você está prestes a eliminar suas alterações.</translation>
     </message>
@@ -3016,7 +3215,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="296"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="232"/>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
@@ -3376,90 +3575,90 @@ p, li { white-space: pre-wrap; }
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="252"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="229"/>
         <source>Open file</source>
         <translation>Abrir arquivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="256"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="233"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="332"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="309"/>
         <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="444"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
         <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="491"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
         <source>Print runtime table</source>
         <translation>Imprimir tabela</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="834"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="811"/>
         <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="836"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="813"/>
         <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="841"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="818"/>
         <source>Save changes?</source>
         <translation>Salvar Alteraḉões?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1196"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1173"/>
         <source>Save file as</source>
         <translation>Salvar arquivo como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1337"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1314"/>
         <source>Open dive log file</source>
         <translation>Abrir arquivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="819"/>
         <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="300"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="444"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="277"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1180"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1157"/>
         <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="625"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="602"/>
         <source>Yearly statistics</source>
         <translation>Estatisticas Anuais</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1197"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1174"/>
         <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="1338"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1315"/>
         <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <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>
@@ -3467,7 +3666,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="651"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="634"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation type="unfinished"/>
     </message>
@@ -3475,39 +3674,39 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="239"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="243"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="244"/>
         <source>Not now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="245"/>
         <source>Update firmware</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
         <source>Firmware upgrade notice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
         <source>Save the downloaded firmware as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
         <source>HEX files (*.hex)</source>
         <translation type="unfinished"/>
     </message>
@@ -3515,54 +3714,69 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Open circuit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>ft/min</source>
         <translation>pés/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="481"/>
         <source>Last stop at 20ft</source>
         <translation>Ultima parada em 20 pés</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="482"/>
         <source>50% avg. depth to 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="489"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
         <source>20ft to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="485"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
         <source>Last stop at 6m</source>
         <translation>Ultima parada em 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
         <source>50% avg. depth to 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="494"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
         <source>6m to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="497"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="498"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
         <source>cuft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="506"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="507"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="500"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="501"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
@@ -3681,6 +3895,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="816"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -3715,57 +3930,87 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="795"/>
+        <source>CCR: Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="809"/>
+        <source>Default CCR set-point for dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="832"/>
+        <source>pSCR O₂ metabolism rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="839"/>
+        <source>pSCR ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="846"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="859"/>
+        <source>1:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="875"/>
         <source>System default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="843"/>
+        <location filename="../qt-ui/preferences.ui" line="914"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="849"/>
+        <location filename="../qt-ui/preferences.ui" line="920"/>
         <source>Proxy type</source>
         <translation>Tipo de Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="862"/>
+        <location filename="../qt-ui/preferences.ui" line="933"/>
         <source>Host</source>
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="888"/>
+        <location filename="../qt-ui/preferences.ui" line="959"/>
         <source>Port</source>
         <translation>Porta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="914"/>
+        <location filename="../qt-ui/preferences.ui" line="985"/>
         <source>Requires authentication</source>
         <translation>Requer Autenticação</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="934"/>
+        <location filename="../qt-ui/preferences.ui" line="1005"/>
         <source>Username</source>
         <translation>Nome de usuario</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="957"/>
+        <location filename="../qt-ui/preferences.ui" line="1028"/>
         <source>Password</source>
         <translation>Senha</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="985"/>
-        <source>about:blank</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="1011"/>
-        <source>Disconnect from facebook</source>
+        <location filename="../qt-ui/preferences.ui" line="1079"/>
+        <source>Disconnect from Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="824"/>
+        <location filename="../qt-ui/preferences.ui" line="895"/>
         <source>Filter</source>
         <translation>Filtro</translation>
     </message>
@@ -3920,52 +4165,52 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="28"/>
+        <location filename="../qt-ui/preferences.cpp" line="44"/>
         <source>No proxy</source>
         <translation>Sem proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="29"/>
+        <location filename="../qt-ui/preferences.cpp" line="45"/>
         <source>System proxy</source>
         <translation>Proxy do sistema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="30"/>
+        <location filename="../qt-ui/preferences.cpp" line="46"/>
         <source>HTTP proxy</source>
         <translation>Proxy HTTP</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="31"/>
+        <location filename="../qt-ui/preferences.cpp" line="47"/>
         <source>SOCKS proxy</source>
         <translation>Proxy SOCKS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="291"/>
+        <location filename="../qt-ui/preferences.cpp" line="324"/>
         <source>Restart required</source>
         <translation>Reinicialização necessária</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="292"/>
+        <location filename="../qt-ui/preferences.cpp" line="325"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>Para carregar corretamente uma nova língua você deve reiniciar o Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="456"/>
+        <location filename="../qt-ui/preferences.cpp" line="494"/>
         <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Arquivos XML do Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Open default log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="455"/>
+        <location filename="../qt-ui/preferences.cpp" line="493"/>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
@@ -3973,17 +4218,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="91"/>
+        <location filename="../qt-ui/printdialog.cpp" line="85"/>
         <source>&amp;Preview</source>
         <translation>&amp;Prévisualizar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="88"/>
+        <location filename="../qt-ui/printdialog.cpp" line="82"/>
         <source>P&amp;rint</source>
         <translation>Imp&amp;rimir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="103"/>
+        <location filename="../qt-ui/printdialog.cpp" line="97"/>
         <source>Print</source>
         <translation>Imprimir</translation>
     </message>
@@ -3991,42 +4236,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="20"/>
         <source>Dive#</source>
         <translation>Mergulho nº</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="21"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="22"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="23"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Master</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Buddy</source>
         <translation>Parceiro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="34"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Location</source>
         <translation>Local</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <location filename="../qt-ui/printlayout.cpp" line="63"/>
         <source>Subsurface cannot find a usable printer on this system!</source>
         <translation type="unfinished"/>
     </message>
@@ -4092,72 +4337,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2095"/>
+        <location filename="../qt-ui/models.cpp" line="2101"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2100"/>
+        <location filename="../qt-ui/models.cpp" line="2106"/>
         <source>Dive #%1 - %2</source>
         <translation>Mergulho #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2103"/>
+        <location filename="../qt-ui/models.cpp" line="2109"/>
         <source>Max depth: %1 %2</source>
         <translation>Profundidade máxima: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2110"/>
+        <location filename="../qt-ui/models.cpp" line="2116"/>
         <source>Duration: %1 min</source>
         <translation>Duração: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2115"/>
+        <location filename="../qt-ui/models.cpp" line="2121"/>
         <source>Gas used:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2117"/>
+        <location filename="../qt-ui/models.cpp" line="2123"/>
         <source>Tags:</source>
         <translation>Tags:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2119"/>
+        <location filename="../qt-ui/models.cpp" line="2125"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2121"/>
+        <location filename="../qt-ui/models.cpp" line="2127"/>
         <source>Weights:</source>
         <translation>Lastro:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2126"/>
+        <location filename="../qt-ui/models.cpp" line="2132"/>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2133"/>
+        <location filename="../qt-ui/models.cpp" line="2139"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2135"/>
+        <location filename="../qt-ui/models.cpp" line="2141"/>
         <source>Buddy:</source>
         <translation>Companheiro:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2137"/>
+        <location filename="../qt-ui/models.cpp" line="2143"/>
         <source>Suit:</source>
         <translation>Roupa:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2139"/>
+        <location filename="../qt-ui/models.cpp" line="2145"/>
         <source>Viz:</source>
         <translation>Visibilidade:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2141"/>
+        <location filename="../qt-ui/models.cpp" line="2147"/>
         <source>Rating:</source>
         <translation>Classificação:</translation>
     </message>
@@ -4165,103 +4410,108 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="628"/>
         <source> (#%1 of %2)</source>
         <translation> (#%1 de %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="630"/>
+        <source>Unknown dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="647"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1168"/>
         <source>Make first divecomputer</source>
         <translation>Marcar como primeiro computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Delete this divecomputer</source>
         <translation>Apagar este computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1184"/>
         <source>Add gas change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1187"/>
         <source> (Tank %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1195"/>
         <source>Add set-point change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1197"/>
         <source>Add bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
         <source>Remove event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1206"/>
         <source>Hide similar events</source>
         <translation>Esconder eventos semelhantes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1213"/>
         <source>Edit name</source>
         <translation>Editar nome</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1242"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1249"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1264"/>
         <source>Unhide all events</source>
         <translation>Mostrar todos os eventos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide events</source>
         <translation>Ocultar eventos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide all %1 events?</source>
         <translation>Esconder todos os %1 eventos?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1333"/>
         <source>Remove the selected event?</source>
         <translation>Remover o evento selecionado?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1334"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1424"/>
         <source>Edit name of bookmark</source>
         <translation>Editar nome do favorito</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
         <source>Custom name:</source>
         <translation>Apelido:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1430"/>
         <source>Name is too long!</source>
         <translation type="unfinished"/>
     </message>
@@ -4269,102 +4519,102 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>AIR</source>
         <translation>AR</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>OXYGEN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="208"/>
         <source>Remove this point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="57"/>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="42"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="25"/>
         <source>Average</source>
         <translation>Média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="45"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="28"/>
         <source>Minimum</source>
         <translation>Mínimo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="48"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="31"/>
         <source>Maximum</source>
         <translation>Máximo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="297"/>
+        <location filename="../qt-ui/globe.cpp" line="296"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>Mova o mapa e dê um duplo clique para definir a localização do ponto de mergulho.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="525"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="526"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="550"/>
         <source>ft</source>
         <translation>pé(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="551"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="570"/>
+        <location filename="../qt-ui/models.cpp" line="574"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="571"/>
+        <location filename="../qt-ui/models.cpp" line="575"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="595"/>
+        <location filename="../qt-ui/models.cpp" line="599"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="596"/>
+        <location filename="../qt-ui/models.cpp" line="600"/>
         <source>cuft</source>
         <translation>pés cúbicos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="513"/>
         <source>Invalid response from server</source>
         <translation>Resposta inválida do servidor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation>Esperava rótulo XML &apos;DiveDateReader&apos;, recebido &apos;%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="567"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation>Rótulo XML &apos;DiveDates&apos; esperado não foi encontrado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Resposta XML defeituosa. Linha %1: %2</translation>
     </message>
@@ -4372,12 +4622,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1450"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1518"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1442"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -4391,12 +4641,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
-        <location filename="../qt-ui/simplewidgets.cpp" line="151"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="134"/>
         <source>New starting number</source>
         <translation>Novo número inicial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="149"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="132"/>
         <source>New number</source>
         <translation>Novo numero</translation>
     </message>
@@ -4404,12 +4654,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1575"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1653"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1579"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1657"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -4488,12 +4738,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Qual dia e hora são mostrados na imagem?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="276"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="259"/>
         <source>Open image file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="278"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="261"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Imagens (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -4546,7 +4796,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <name>SocialNetworkDialog</name>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="282"/>
-        <source>Dive Date: %1 
+        <source>Dive date: %1 
 </source>
         <translation type="unfinished"/>
     </message>
@@ -4570,7 +4820,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="290"/>
-        <source>Dive Location: %1 
+        <source>Dive location: %1 
 </source>
         <translation type="unfinished"/>
     </message>
@@ -4687,47 +4937,47 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="329"/>
         <source>Webservice</source>
         <translation>Serviço web</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="393"/>
         <source>Connecting...</source>
         <translation>Conectando...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
         <source>Download finished</source>
         <translation>Recebimento finalizado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Download error: %1</source>
         <translation>Erro no recebimento: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="436"/>
         <source>Connection error: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
         <source>Download successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="439"/>
         <source>Invalid user identifier!</source>
         <translation>Identificador de usuário inválido!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="312"/>
         <source>Enter User ID and click Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="442"/>
         <source>Cannot parse response!</source>
         <translation>Não é possível analisar a resposta!</translation>
     </message>
@@ -4735,7 +4985,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="592"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="575"/>
         <source>Suits: </source>
         <translation type="unfinished"/>
     </message>
@@ -4743,7 +4993,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="119"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="116"/>
         <source>No suit set</source>
         <translation type="unfinished"/>
     </message>
@@ -4760,7 +5010,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="513"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="496"/>
         <source>Tags: </source>
         <translation type="unfinished"/>
     </message>
@@ -4768,7 +5018,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="144"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="141"/>
         <source>Empty tags</source>
         <translation type="unfinished"/>
     </message>
@@ -4776,17 +5026,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -4794,7 +5044,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="141"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="131"/>
         <source>Information</source>
         <translation>Informação</translation>
     </message>
@@ -4802,7 +5052,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1090"/>
+        <location filename="../qt-ui/models.cpp" line="1094"/>
         <source> (%1 shown)</source>
         <translation type="unfinished"/>
     </message>
@@ -4810,72 +5060,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="64"/>
         <source>Check for updates.</source>
         <translation>Buscar atualizações.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="66"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface não conseguiu localizar updates</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="70"/>
         <source>The following error occurred:</source>
         <translation>O seguinte erro ocorreu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="72"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
         <source>Please check your internet connection.</source>
         <translation>Por favor, verifique sua conexão a internet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="85"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="84"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="88"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="95"/>
         <source>A new version of Subsurface is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="97"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
         <source>Latest version is %1, please check with your OS vendor for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="103"/>
         <source>Newest release version is </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="105"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
         <source>The server returned the following information:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="121"/>
         <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
         <source>Decline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="124"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
         <source>Accept</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="126"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="125"/>
         <source>Automatic check for updates</source>
         <translation type="unfinished"/>
     </message>
@@ -4883,13 +5133,13 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UserManual</name>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="55"/>
+        <location filename="../qt-ui/usermanual.cpp" line="54"/>
         <source>User Manual</source>
         <translation>Manual do Usuário</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="72"/>
-        <location filename="../qt-ui/usermanual.cpp" line="78"/>
+        <location filename="../qt-ui/usermanual.cpp" line="71"/>
+        <location filename="../qt-ui/usermanual.cpp" line="77"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Não foi possível encontrar o manual do Subsurface</translation>
     </message>
@@ -4967,84 +5217,84 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
         <source>
 Operating System: %1</source>
         <translation>
 Sistema Operacional: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 Arquitetura do Processador: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 Language: %1</source>
         <translation>
 Lingua: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="93"/>
         <source>Should we ask you later?</source>
         <translation>Perguntar depois?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Don&apos;t ask me again</source>
         <translation>Não</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Ask later</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
         <source>Submit user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask again?</source>
         <translation>Perguntar depois?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="17"/>
         <source>Send</source>
         <translation>Enviar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation>Subsurface não conseguiu enviar a pesquisa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="121"/>
         <source>The following error occurred:</source>
         <translation>O seguinte erro ocorreu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>Please check your internet connection.</source>
         <translation>Por favor, verifique sua conexão a internet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="131"/>
         <source>Survey successfully submitted.</source>
         <translation>Pesquisa enviada com sucesso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="136"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation>Houve um erro enquanto buscavamos pela atualização.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -5052,12 +5302,12 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -5105,12 +5355,12 @@ OS CPU Architecture: %1</source>
         <translation>Enviar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="247"/>
         <source>Operation timed out</source>
         <translation>Tempo limite para operação estourou</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="268"/>
         <source>Transferring data...</source>
         <translation type="unfinished"/>
     </message>
@@ -5118,17 +5368,17 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="496"/>
+        <location filename="../qt-ui/models.cpp" line="500"/>
         <source>Clicking here will remove this weight system.</source>
         <translation type="unfinished"/>
     </message>
@@ -5136,19 +5386,19 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1479"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1487"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1497"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1555"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1566"/>
         <source>Failed!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1506"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1576"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1580"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -5156,79 +5406,79 @@ OS CPU Architecture: %1</source>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1841"/>
+        <location filename="../qt-ui/models.cpp" line="1847"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Ano
 &gt; Mês / Viagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1844"/>
+        <location filename="../qt-ui/models.cpp" line="1850"/>
         <source>#</source>
         <translation>nº</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1847"/>
+        <location filename="../qt-ui/models.cpp" line="1853"/>
         <source>Duration 
  Total</source>
         <translation>Duração
 Total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1850"/>
+        <location filename="../qt-ui/models.cpp" line="1856"/>
         <source>
 Average</source>
         <translation>
 Média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1853"/>
+        <location filename="../qt-ui/models.cpp" line="1859"/>
         <source>
 Shortest</source>
         <translation>
 Mais curto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1856"/>
+        <location filename="../qt-ui/models.cpp" line="1862"/>
         <source>
 Longest</source>
         <translation>
 Mais longo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1859"/>
+        <location filename="../qt-ui/models.cpp" line="1865"/>
         <source>Depth (%1)
  Average</source>
         <translation>Profundidade (%1)
 Média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1862"/>
-        <location filename="../qt-ui/models.cpp" line="1871"/>
-        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>
 Minimum</source>
         <translation>
 Mínimo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1865"/>
-        <location filename="../qt-ui/models.cpp" line="1874"/>
-        <location filename="../qt-ui/models.cpp" line="1883"/>
+        <location filename="../qt-ui/models.cpp" line="1871"/>
+        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>
 Maximum</source>
         <translation>
 Máximo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1874"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Médio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1883"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -5309,40 +5559,40 @@ Médio</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1508"/>
+        <location filename="../dive.c" line="1530"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) ou (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="464"/>
+        <location filename="../divelist.c" line="467"/>
         <location filename="../equipment.c" line="81"/>
-        <location filename="../planner.c" line="1060"/>
-        <location filename="../planner.c" line="1063"/>
+        <location filename="../planner.c" line="1081"/>
+        <location filename="../planner.c" line="1084"/>
         <source>air</source>
         <translation>ar</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="192"/>
+        <location filename="../equipment.c" line="194"/>
         <source>integrated</source>
         <translation>integrado</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="193"/>
+        <location filename="../equipment.c" line="195"/>
         <source>belt</source>
         <translation>cinto</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="194"/>
+        <location filename="../equipment.c" line="196"/>
         <source>ankle</source>
         <translation>tornozelo</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="195"/>
+        <location filename="../equipment.c" line="197"/>
         <source>backplate weight</source>
         <translation>lastro no arnês</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="196"/>
+        <location filename="../equipment.c" line="198"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -5350,7 +5600,7 @@ Médio</translation>
         <location filename="../file.c" line="112"/>
         <location filename="../file.c" line="434"/>
         <location filename="../file.c" line="506"/>
-        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="925"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Falha na leitura de &apos;%s&apos;</translation>
     </message>
@@ -5407,9 +5657,9 @@ Médio</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../file.c" line="869"/>
-        <location filename="../file.c" line="909"/>
-        <location filename="../file.c" line="1007"/>
+        <location filename="../file.c" line="870"/>
+        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="1016"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>O número máximo de colunas suportadas ao importar arquivos CSV é %d</translation>
     </message>
@@ -5580,27 +5830,27 @@ Médio</translation>
         <translation>número de evento inválido</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="421"/>
+        <location filename="../libdivecomputer.c" line="419"/>
         <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="427"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Error registering the data</source>
         <translation>Erro no registo dos dados</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="433"/>
         <source>Error parsing the datetime</source>
         <translation>Erro na análise da data/horário</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Dive %d: %s</source>
         <translation>Mergulho nº %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="455"/>
+        <location filename="../libdivecomputer.c" line="454"/>
         <source>Error parsing the divetime</source>
         <translation>Erro na análise da duração do mergulho</translation>
     </message>
@@ -5610,82 +5860,82 @@ Médio</translation>
         <translation>Erro na análise da profundidade máxima</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="482"/>
+        <location filename="../libdivecomputer.c" line="483"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="501"/>
+        <location filename="../libdivecomputer.c" line="503"/>
         <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="513"/>
+        <location filename="../libdivecomputer.c" line="515"/>
         <source>Error obtaining water salinity</source>
         <translation>Erro na obtenção da salinidade da água</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="521"/>
+        <location filename="../libdivecomputer.c" line="524"/>
         <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="545"/>
+        <location filename="../libdivecomputer.c" line="549"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="562"/>
+        <location filename="../libdivecomputer.c" line="569"/>
         <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="569"/>
+        <location filename="../libdivecomputer.c" line="576"/>
         <source>Error parsing the samples</source>
         <translation>Erro na análise das amostras</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="706"/>
+        <location filename="../libdivecomputer.c" line="713"/>
         <source>Event: waiting for user action</source>
         <translation>Evento: aguardando ação do usuário</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="714"/>
+        <location filename="../libdivecomputer.c" line="721"/>
         <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="778"/>
+        <location filename="../libdivecomputer.c" line="785"/>
         <source>Error registering the event handler.</source>
         <translation>Erro no registo do rótulo do evento.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="783"/>
+        <location filename="../libdivecomputer.c" line="790"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Erro no registo do rótulo de cancelamento.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="804"/>
+        <location filename="../libdivecomputer.c" line="811"/>
         <source>Dive data import error</source>
         <translation>Erro ao importar os dados do mergulho</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="843"/>
+        <location filename="../libdivecomputer.c" line="850"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Não é possivel criar contexto da libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="850"/>
+        <location filename="../libdivecomputer.c" line="857"/>
         <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="858"/>
+        <location filename="../libdivecomputer.c" line="865"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="506"/>
+        <location filename="../parse-xml.c" line="516"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Percentagem estranha na leitura %s
@@ -5693,74 +5943,74 @@ Médio</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1760"/>
+        <location filename="../parse-xml.c" line="1770"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Falha na análise de &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1989"/>
-        <location filename="../parse-xml.c" line="2137"/>
+        <location filename="../parse-xml.c" line="1999"/>
+        <location filename="../parse-xml.c" line="2147"/>
         <source>Database query dm4_events failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1996"/>
-        <location filename="../parse-xml.c" line="2144"/>
+        <location filename="../parse-xml.c" line="2006"/>
+        <location filename="../parse-xml.c" line="2154"/>
         <source>Database query dm4_tags failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2318"/>
+        <location filename="../parse-xml.c" line="2328"/>
         <source>Database query shearwater_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2325"/>
+        <location filename="../parse-xml.c" line="2335"/>
         <source>Database query shearwater_changes failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2332"/>
+        <location filename="../parse-xml.c" line="2342"/>
         <source>Database query shearwater_profile_sample failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2451"/>
+        <location filename="../parse-xml.c" line="2461"/>
         <source>Database query cobalt_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2458"/>
+        <location filename="../parse-xml.c" line="2468"/>
         <source>Database query cobalt_buddies failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2465"/>
+        <location filename="../parse-xml.c" line="2475"/>
         <source>Database query cobalt_visibility failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2472"/>
+        <location filename="../parse-xml.c" line="2482"/>
         <source>Database query cobalt_location failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2479"/>
+        <location filename="../parse-xml.c" line="2489"/>
         <source>Database query cobalt_location (site) failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2486"/>
+        <location filename="../parse-xml.c" line="2496"/>
         <source>Database query cobalt_profile_sample failed.
 </source>
         <translation type="unfinished"/>
@@ -5773,17 +6023,17 @@ Médio</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2168"/>
-        <location filename="../parse-xml.c" line="2189"/>
-        <location filename="../parse-xml.c" line="2508"/>
-        <location filename="../parse-xml.c" line="2527"/>
+        <location filename="../parse-xml.c" line="2178"/>
+        <location filename="../parse-xml.c" line="2199"/>
+        <location filename="../parse-xml.c" line="2518"/>
+        <location filename="../parse-xml.c" line="2537"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Consulta da base de dados falhou &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2848"/>
+        <location filename="../parse-xml.c" line="2909"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Falha na abertura da folha de estilo %s</translation>
     </message>
@@ -5793,161 +6043,167 @@ Médio</translation>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="820"/>
+        <location filename="../planner.c" line="841"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Não é possivel achar gas o %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="356"/>
+        <location filename="../planner.c" line="363"/>
         <source>Too many gas mixes</source>
         <translation>Misturas de gás em excesso</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="540"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="548"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation>Baseado em GF baixo = %d e GF alto = %d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="544"/>
+        <location filename="../planner.c" line="551"/>
         <source>Subsurface dive plan</source>
         <translation>Plano de mergulho do subsurface</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="548"/>
+        <location filename="../planner.c" line="555"/>
         <source>depth</source>
         <translation>profundidade</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="558"/>
         <source>runtime</source>
         <translation>tempo</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="554"/>
+        <location filename="../planner.c" line="561"/>
         <source>duration</source>
         <translation>duração</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="557"/>
+        <location filename="../planner.c" line="564"/>
         <source>gas</source>
         <translation>gás</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="594"/>
+        <location filename="../planner.c" line="601"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="602"/>
+        <location filename="../planner.c" line="609"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Transição pra %.*f %s em %d:%02d min - tempo %d:%02u em %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="615"/>
+        <location filename="../planner.c" line="622"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="622"/>
+        <location filename="../planner.c" line="629"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Fique em %.*f %s por %d:%02d min - durante %d:%02u em %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="635"/>
+        <location filename="../planner.c" line="642"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="638"/>
-        <location filename="../planner.c" line="642"/>
+        <location filename="../planner.c" line="645"/>
+        <location filename="../planner.c" line="649"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="651"/>
+        <location filename="../planner.c" line="658"/>
         <source>(SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="676"/>
+        <location filename="../planner.c" line="683"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="678"/>
+        <location filename="../planner.c" line="685"/>
         <source>Switch gas to %s</source>
         <translation>Trocar o gás por %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="697"/>
+        <location filename="../planner.c" line="704"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="699"/>
+        <location filename="../planner.c" line="706"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="710"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="705"/>
+        <location filename="../planner.c" line="712"/>
         <source>Gas consumption:</source>
         <translation>Consumo de gás</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="535"/>
-        <location filename="../planner.c" line="725"/>
-        <location filename="../planner.c" line="730"/>
-        <location filename="../planner.c" line="753"/>
+        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="732"/>
+        <location filename="../planner.c" line="737"/>
+        <location filename="../planner.c" line="762"/>
+        <location filename="../planner.c" line="772"/>
         <source>Warning:</source>
         <translation>Aviso:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="523"/>
+        <location filename="../planner.c" line="530"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="726"/>
+        <location filename="../planner.c" line="733"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>Isso é mais gás que a capacidade do cilindro especificado</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="731"/>
+        <location filename="../planner.c" line="738"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>Sem reserva para compartilhar ar na subida</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="733"/>
+        <location filename="../planner.c" line="740"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="735"/>
+        <location filename="../planner.c" line="742"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s durante a subida planejada) de %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="759"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>valor pO₂ alto %.2f em %d:%02u com gás %s na profundidade %.*f %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="1064"/>
+        <location filename="../planner.c" line="769"/>
+        <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="1085"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1099"/>
+        <location filename="../profile.c" line="1113"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -5956,70 +6212,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1102"/>
+        <location filename="../profile.c" line="1116"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1106"/>
+        <location filename="../profile.c" line="1120"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1112"/>
+        <location filename="../profile.c" line="1126"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1115"/>
+        <location filename="../profile.c" line="1129"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1117"/>
+        <location filename="../profile.c" line="1131"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1119"/>
+        <location filename="../profile.c" line="1133"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1121"/>
+        <location filename="../profile.c" line="1135"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1123"/>
+        <location filename="../profile.c" line="1137"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1140"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1147"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -6028,7 +6284,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1137"/>
+        <location filename="../profile.c" line="1151"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -6037,146 +6293,146 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1149"/>
+        <location filename="../profile.c" line="1163"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Parada de segurança:  %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1152"/>
+        <location filename="../profile.c" line="1166"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Parada de segurança: tempo desconhecido @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1157"/>
+        <location filename="../profile.c" line="1171"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1174"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: tempo desconhecido @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1178"/>
         <source>In deco
 </source>
         <translation>Em deco
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1166"/>
+        <location filename="../profile.c" line="1180"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1183"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1172"/>
+        <location filename="../profile.c" line="1186"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1180"/>
+        <location filename="../profile.c" line="1194"/>
         <source>In deco (calc)
 </source>
         <translation>Em deco (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1196"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1185"/>
+        <location filename="../profile.c" line="1199"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1188"/>
+        <location filename="../profile.c" line="1202"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Teto calculado %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1194"/>
+        <location filename="../profile.c" line="1208"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Tecido %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1214"/>
         <source>heartbeat: %d
 </source>
         <translation>Cardio: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1202"/>
+        <location filename="../profile.c" line="1216"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1205"/>
+        <location filename="../profile.c" line="1219"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1314"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1304"/>
-        <location filename="../profile.c" line="1308"/>
-        <location filename="../profile.c" line="1312"/>
+        <location filename="../profile.c" line="1318"/>
+        <location filename="../profile.c" line="1322"/>
+        <location filename="../profile.c" line="1326"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1316"/>
+        <location filename="../profile.c" line="1330"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1334"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1324"/>
-        <location filename="../profile.c" line="1328"/>
+        <location filename="../profile.c" line="1338"/>
+        <location filename="../profile.c" line="1342"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1335"/>
+        <location filename="../profile.c" line="1349"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -6307,6 +6563,7 @@ EADD: %d%s
     </message>
     <message>
         <location filename="../dive.c" line="30"/>
+        <location filename="../equipment.c" line="85"/>
         <source>oxygen</source>
         <translation type="unfinished"/>
     </message>
@@ -6361,97 +6618,97 @@ EADD: %d%s
         <translation>(nenhum mergulho)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Mon</source>
         <translation>Seg</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Tue</source>
         <translation>Ter</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Wed</source>
         <translation>Qua</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Thu</source>
         <translation>Qui</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Fri</source>
         <translation>Sex</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sat</source>
         <translation>Sáb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Feb</source>
         <translation>Fev</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Apr</source>
         <translation>Abr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Aug</source>
         <translation>Ago</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Sep</source>
         <translation>Set</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Oct</source>
         <translation>Out</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
@@ -7055,13 +7312,13 @@ O Uemis Zurich está conectado corretamente?</translation>
         <translation>Planejando</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
         <source>GF low</source>
         <translation>GF baixo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>%</source>
         <translation>%</translation>
     </message>
@@ -7071,7 +7328,7 @@ O Uemis Zurich está conectado corretamente?</translation>
         <translation>GF alto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="335"/>
         <source>Drop to first depth</source>
         <translation>Descer até o primeiro ponto</translation>
     </message>
@@ -7081,69 +7338,69 @@ O Uemis Zurich está conectado corretamente?</translation>
         <translation>Ultima parada em 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
         <source>Plan backgas breaks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="355"/>
         <source>Gas options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="376"/>
         <source>Bottom SAC</source>
         <translation>SAC no fundo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="383"/>
         <source>Deco SAC</source>
         <translation>Deco SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="380"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="390"/>
         <source>Bottom pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="403"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="413"/>
         <source>Deco pO₂</source>
         <translation>Deco pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="449"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="462"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="478"/>
         <source>Dive notes</source>
         <translation>Notas do mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
         <source>Display runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <source>Display segment duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="531"/>
         <source>Display transitions in deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="538"/>
         <source>Verbatim dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="387"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="410"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="397"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -7163,17 +7420,17 @@ O Uemis Zurich está conectado corretamente?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="499"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>No planejador, mostrar tempo de mergulho absoluto das paradas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="515"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>No planejador mostrar tempo relativo das paradas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>No planejador, listar transições ou tratar elas de forma implicita</translation>
     </message>
diff --git a/translations/subsurface_pt_PT.ts b/translations/subsurface_pt_PT.ts
index 866c8ef2f..844f321d6 100644
--- a/translations/subsurface_pt_PT.ts
+++ b/translations/subsurface_pt_PT.ts
@@ -3,12 +3,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="539"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="522"/>
         <source>Person: </source>
         <translation>Companheiro:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="540"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="523"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Busca por companheiros e guias de mergulho</translation>
     </message>
@@ -16,40 +16,188 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="233"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="230"/>
         <source>No buddies</source>
         <translation>Sem companheiros</translation>
     </message>
 </context>
 <context>
+    <name>ColumnNameProvider</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>GPS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Avg depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="210"/>
+        <location filename="../configuredivecomputer.cpp" line="212"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation>Não foi possível gravar a cópia de segurança %1. Mensagem de erro: %2</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="226"/>
+        <location filename="../configuredivecomputer.cpp" line="228"/>
         <source>Could not open backup file: %1</source>
         <translation>Não foi possível abrir a cópia de segurança: %1</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="542"/>
+        <location filename="../configuredivecomputer.cpp" line="552"/>
         <source>Dive computer details read successfully</source>
         <translation>Detalhes do computador de mergulho lidos com sucesso</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="551"/>
+        <location filename="../configuredivecomputer.cpp" line="561"/>
         <source>Setting successfully written to device</source>
         <translation>Parâmetro gravado com sucesso no dispositivo</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="560"/>
+        <location filename="../configuredivecomputer.cpp" line="570"/>
         <source>Device firmware successfully updated</source>
         <translation>Firmware do dispositivo actualizado com sucesso</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="569"/>
+        <location filename="../configuredivecomputer.cpp" line="579"/>
         <source>Device settings successfully reset</source>
         <translation>Configurações do dispositivo reconfiguradas com sucesso</translation>
     </message>
@@ -847,72 +995,72 @@
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1053"/>
         <source>Backup files (*.xml)</source>
         <translation>Cópias de segurança (*.xml)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1037"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>Ocorreu um erro ao efectuar a cópia de segurança.
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1040"/>
         <source>Backup succeeded</source>
         <translation>Cópia de segurança efectuada com sucesso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1041"/>
         <source>Your settings have been saved to: %1</source>
         <translation>As suas configurações foram gravadas em: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1030"/>
         <source>Backup dive computer settings</source>
         <translation>Cópia de segurança das configurações do computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1036"/>
         <source>XML backup error</source>
         <translation>Erro na cópia de segurança XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1052"/>
         <source>Restore dive computer settings</source>
         <translation>Restaurar configurações do computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1056"/>
         <source>XML restore error</source>
         <translation>Erro ao restaurar XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1057"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>Ocorreu um erro ao restaurar a cópia de segurança.
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1063"/>
         <source>Restore succeeded</source>
         <translation>Reposição efectuada com sucesso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1064"/>
         <source>Your settings have been restored successfully.</source>
         <translation>As suas definições foram restauradas com sucesso.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1074"/>
         <source>Select firmware file</source>
         <translation>Seleccionar ficheiro de firmware</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1075"/>
         <source>All files (*.*)</source>
         <translation>Todos os ficheiros (*.*)</translation>
     </message>
@@ -970,12 +1118,12 @@
         <translation>Ao clicar aqui irá eliminar esta garrafa.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="410"/>
         <source>Cylinder cannot be removed</source>
         <translation>A garrafa não pode ser eliminada</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="407"/>
+        <location filename="../qt-ui/models.cpp" line="411"/>
         <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>
@@ -1051,12 +1199,12 @@
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="48"/>
         <source>Remove the selected dive computer?</source>
         <translation>Remover o computador de mergulho seleccionado ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="49"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
         <translation>Tem a certeza que deseja
@@ -1071,22 +1219,22 @@ remover o computador de mergulho seleccionado?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Model</source>
         <translation>Modelo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Device ID</source>
         <translation>ID do dispositivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Nickname</source>
         <translation>Alcunha</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Ao clicar aqui irá remover este computador de mergulho.</translation>
     </message>
@@ -1094,117 +1242,145 @@ remover o computador de mergulho seleccionado?</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="115"/>
         <source>Bailing out to OC</source>
         <translation>Troca de emergência para CA</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="117"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>iniciar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>fim</translation>
     </message>
 </context>
 <context>
+    <name>DiveImportedModel</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="556"/>
+        <source>Date/time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
+        <source>Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>h:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>min</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1242"/>
+        <location filename="../qt-ui/models.cpp" line="1248"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1245"/>
+        <location filename="../qt-ui/models.cpp" line="1251"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1248"/>
+        <location filename="../qt-ui/models.cpp" line="1254"/>
         <source>Rating</source>
         <translation>Classificação</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Depth(%1)</source>
         <translation>Profundidade(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>ft</source>
         <translation>pé</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1254"/>
+        <location filename="../qt-ui/models.cpp" line="1260"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1263"/>
         <source>Temp(%1%2)</source>
         <translation>Temperatura(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>Weight(%1)</source>
         <translation>Peso(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>lbs</source>
         <translation>libra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1263"/>
+        <location filename="../qt-ui/models.cpp" line="1269"/>
         <source>Suit</source>
         <translation>Fato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1266"/>
+        <location filename="../qt-ui/models.cpp" line="1272"/>
         <source>Cyl</source>
         <translation>Garrafa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1269"/>
+        <location filename="../qt-ui/models.cpp" line="1275"/>
         <source>Gas</source>
         <translation>Gás</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1277"/>
+        <location filename="../qt-ui/models.cpp" line="1283"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1280"/>
+        <location filename="../qt-ui/models.cpp" line="1286"/>
         <source>Max CNS</source>
         <translation>CNS Máx</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1283"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>Location</source>
         <translation>Local</translation>
     </message>
@@ -1212,87 +1388,87 @@ remover o computador de mergulho seleccionado?</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="787"/>
+        <location filename="../qt-ui/divelistview.cpp" line="768"/>
         <source>Expand all</source>
         <translation>Expandir todos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="788"/>
+        <location filename="../qt-ui/divelistview.cpp" line="769"/>
         <source>Collapse all</source>
         <translation>Colapsar todos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="789"/>
+        <location filename="../qt-ui/divelistview.cpp" line="770"/>
         <source>Collapse others</source>
         <translation>Colapsar outros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="791"/>
+        <location filename="../qt-ui/divelistview.cpp" line="772"/>
         <source>Remove dive(s) from trip</source>
         <translation>Remover mergulho(s) desta viagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="792"/>
+        <location filename="../qt-ui/divelistview.cpp" line="773"/>
         <source>Create new trip above</source>
         <translation>Criar uma nova viagem acima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="806"/>
+        <location filename="../qt-ui/divelistview.cpp" line="787"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Adicionar mergulho(s) à viagem imediatamente acima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="808"/>
+        <location filename="../qt-ui/divelistview.cpp" line="789"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Adicionar mergulho(s) à viagem imediatamente abaixo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="812"/>
+        <location filename="../qt-ui/divelistview.cpp" line="793"/>
         <source>Merge trip with trip above</source>
         <translation>Juntar esta viagem com a viagem acima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="813"/>
+        <location filename="../qt-ui/divelistview.cpp" line="794"/>
         <source>Merge trip with trip below</source>
         <translation>Juntar esta viagem com a viagem abaixo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="817"/>
+        <location filename="../qt-ui/divelistview.cpp" line="798"/>
         <source>Delete dive(s)</source>
         <translation>Eliminar mergulho(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="819"/>
+        <location filename="../qt-ui/divelistview.cpp" line="800"/>
         <source>Mark dive(s) invalid</source>
         <translation>Marcar mergulho(s) como inválido(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="823"/>
+        <location filename="../qt-ui/divelistview.cpp" line="804"/>
         <source>Merge selected dives</source>
         <translation>Juntar os mergulhos seleccionados</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="825"/>
+        <location filename="../qt-ui/divelistview.cpp" line="806"/>
         <source>Renumber dive(s)</source>
         <translation>Renumerar mergulho(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="826"/>
+        <location filename="../qt-ui/divelistview.cpp" line="807"/>
         <source>Shift times</source>
         <translation>Alterar tempos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="827"/>
+        <location filename="../qt-ui/divelistview.cpp" line="808"/>
         <source>Load images</source>
         <translation>Carregar imagens</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Open image files</source>
         <translation>Abrir ficheiros de imagens</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Ficheiros de imagem (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -1477,100 +1653,100 @@ remover o computador de mergulho seleccionado?</translation>
         <translation>Areia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>Ficheiros UDDF  (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="268"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>Ficheiros CSV (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="68"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Formato de uso genérico para trocar dados entre vários programas relacionados com o mergulho.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>Valores separados por vírgulas que descrevem o perfil do mergulho.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation>Valores separados por vírgulas que descrevem dados sobre o mergulho. Incluem a maior parte dos dados de mergulho mas não informações sobre o perfil,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Enviar dados de mergulho para o sítio da web do divelogs.de.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>Enviar dados do mergulho para dive-share.appspot.com</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>Exportar HTML dos locais de mergulho, visualizados num mapa mundo.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
         <source>Subsurface native XML format.</source>
         <translation>Formato XML nativo do Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
         <source>Write depths of images to file.</source>
         <translation>Escrever as profundidades das imagens para um ficheiro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export UDDF file as</source>
         <translation>Exportar ficheiro UDDF como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="267"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
         <source>Export CSV file as</source>
         <translation>Exportar ficheiro CSV como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="278"/>
         <source>Export world map</source>
         <translation>Exportar mapa mundo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="299"/>
         <source>HTML files (*.html)</source>
         <translation>Ficheiros HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="283"/>
         <source>Export Subsurface XML</source>
         <translation>Exportar XML do Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="284"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>Ficheiros XML (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
         <source>Save image depths</source>
         <translation>Gravar profundidades das imagens</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="298"/>
         <source>Export HTML files as</source>
         <translation>Exportar ficheiros HTML como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
         <source>Can&apos;t open file %s</source>
         <translation>Não é possível abrir o ficheiro %s</translation>
     </message>
@@ -1583,248 +1759,228 @@ remover o computador de mergulho seleccionado?</translation>
         <translation>Importar ficheiro de livro de registos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
-        <source>CSV options</source>
-        <translation>Opções CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="281"/>
-        <source>Pre-configured imports</source>
-        <translation>Importar pré-definições </translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="122"/>
-        <source>Depth</source>
-        <translation>Profundidade</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="142"/>
-        <source>Stopdepth</source>
-        <translation>Profundidade da paragem</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="162"/>
-        <source>Pressure</source>
-        <translation>Pressão</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="176"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="466"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
         <source>Time</source>
         <translation>Tempo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="183"/>
-        <source>Temp</source>
-        <translation>Temp</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="213"/>
-        <source>NDL</source>
-        <translation>NDL</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="233"/>
-        <source>TTS</source>
-        <translation>TTS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="253"/>
-        <source>Cns</source>
-        <translation>CNS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="58"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="789"/>
-        <source>Field separator</source>
-        <translation>Separador de campos</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="35"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="363"/>
-        <source>Units</source>
-        <translation>Unidades</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="42"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="370"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="97"/>
         <source>Metric</source>
         <translation>Métrico</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="47"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="375"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="102"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="169"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="298"/>
-        <source>Manual dives</source>
-        <translation>Mergulhos inseridos manualmente</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="316"/>
-        <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source>
-        <translation>Escolha a ordem de dia, mês e ano para formatar a data. O separador pode ser qualquer um dos seguintes caracteres .-/.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="319"/>
-        <source>Date format</source>
-        <translation>Formato para a data</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="332"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="59"/>
         <source>dd.mm.yyyy</source>
         <translation>dd.mm.aaaa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="337"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="64"/>
         <source>mm/dd/yyyy</source>
         <translation>mm/dd/aaaa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="342"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="69"/>
         <source>yyyy-mm-dd</source>
         <translation>aaaa-mm-dd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="392"/>
-        <source>Dive #</source>
-        <translation>Mergulho #</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="426"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="439"/>
-        <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source>
-        <translation>Data nos formatos dd.mm.aaaa, aaaa-mm-dd ou mm/dd/aaaa</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+        <source>Dive #</source>
+        <translation>Mergulho #</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="429"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="500"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="513"/>
-        <source>Dive duration in seconds or in min:sec format</source>
-        <translation>Duração do mergulho em segundos ou no formato min:seg</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="503"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="574"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="591"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
         <source>Tags</source>
         <translation>Etiquetas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="608"/>
-        <source>Cyl size</source>
-        <translation>Tamanho da garrafa</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="625"/>
-        <source>Air temp</source>
-        <translation>Temperatura do ar</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="642"/>
-        <source>Start Pressure</source>
-        <translation>Pressão inicial</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="659"/>
-        <source>Water temp</source>
-        <translation>Temperatura da água</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="676"/>
-        <source>End Press</source>
-        <translation>Pressão final</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="693"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
         <source>O₂</source>
         <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="710"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
         <source>He</source>
         <translation>He</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="742"/>
-        <source>Choose duration format.</source>
-        <translation>Escolher o formato para a duração do mergulho,</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="745"/>
-        <source>Duration format</source>
-        <translation>Formato para a duração do mergulho</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="758"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="78"/>
         <source>Seconds</source>
         <translation>Segundos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="763"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
         <source>Minutes</source>
         <translation>Minutos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="768"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="88"/>
         <source>Minutes:seconds</source>
         <translation>Minutos:segundos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="540"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
         <source>Location</source>
         <translation>Local</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="409"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
         <source>Max depth</source>
         <translation>Prof. Max.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="386"/>
-        <source>Field configuration</source>
-        <translation>Configuração de campos</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+        <source>Tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+        <source>Samples pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
         <source>Mean depth</source>
         <translation>Profundidade média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="483"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
         <source>Buddy</source>
         <translation>Companheiros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="523"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="557"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DivePlanner</name>
@@ -1867,42 +2023,42 @@ remover o computador de mergulho seleccionado?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="691"/>
         <source>Final depth</source>
         <translation>Profundidade final</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="693"/>
         <source>Run time</source>
         <translation>Tempo de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="701"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="695"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="703"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
         <source>Used gas</source>
         <translation>Gás usado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="705"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
         <source>CC set point</source>
         <translation>CC set point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1044"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1051"/>
         <source>Discard the plan?</source>
         <translation>Eliminar o plano?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1045"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1052"/>
         <source>You are about to discard your plan.</source>
         <translation>Está prestes a eliminar o plano.</translation>
     </message>
@@ -1910,22 +2066,22 @@ remover o computador de mergulho seleccionado?</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="257"/>
         <source>Dive planner points</source>
         <translation>Pontos do plano de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="261"/>
         <source>Available gases</source>
         <translation>Gases disponíveis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="284"/>
         <source>Add dive data point</source>
         <translation>Adicionar ponto ao mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="304"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="293"/>
         <source>Save new</source>
         <translation>Gravar novo</translation>
     </message>
@@ -1933,92 +2089,112 @@ remover o computador de mergulho seleccionado?</translation>
 <context>
     <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
         <source>Time</source>
         <translation>Tempo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
         <source>Pressure</source>
         <translation>Pressão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
         <source>Color</source>
         <translation>Côr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
         <source>Pressure S</source>
         <translation>Pressão S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
+        <source>Setpoint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
+        <source>Sensor1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
+        <source>Sensor2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
+        <source>Sensor3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
         <source>Ambient pressure</source>
         <translation>Pressão ambiente</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
-        <source>Heart Beat</source>
-        <translation>Frequência cardíaca</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
+        <source>Heart beat</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
-        <source>Gradient Factor</source>
-        <translation>Factor de gradiente</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/>
+        <source>Gradient factor</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
-        <source>Mean Depth/s</source>
-        <translation>Profundidade(s) média(s)</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
+        <source>Mean depth/s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
         <source>Pressure I</source>
         <translation>Pressão I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
         <source>User entered</source>
         <translation>Inserido pelo utilizador</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
         <source>Cylinder index</source>
         <translation>Lista de garrafas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
         <source>Ceiling</source>
         <translation>Tecto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
         <source>SAC</source>
         <translation>Consumo</translation>
     </message>
@@ -2069,127 +2245,127 @@ remover o computador de mergulho seleccionado?</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1437"/>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1443"/>
+        <location filename="../qt-ui/models.cpp" line="1489"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1440"/>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1492"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1443"/>
-        <location filename="../qt-ui/models.cpp" line="1489"/>
+        <location filename="../qt-ui/models.cpp" line="1449"/>
+        <location filename="../qt-ui/models.cpp" line="1495"/>
         <source>Rating</source>
         <translation>Classificação</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1452"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1458"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1461"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>SAC</source>
         <translation>Consumo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>ft</source>
         <translation>pés</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>Weight(%1)</source>
         <translation>Peso(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1458"/>
-        <location filename="../qt-ui/models.cpp" line="1504"/>
+        <location filename="../qt-ui/models.cpp" line="1464"/>
+        <location filename="../qt-ui/models.cpp" line="1510"/>
         <source>Suit</source>
         <translation>Fato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1461"/>
-        <location filename="../qt-ui/models.cpp" line="1507"/>
+        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1513"/>
         <source>Cyl</source>
         <translation>Garrafa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1464"/>
-        <location filename="../qt-ui/models.cpp" line="1510"/>
+        <location filename="../qt-ui/models.cpp" line="1470"/>
+        <location filename="../qt-ui/models.cpp" line="1516"/>
         <source>Gas</source>
         <translation>Gás</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1473"/>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1527"/>
         <source>Max CNS</source>
         <translation>CNS Máx</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
-        <location filename="../qt-ui/models.cpp" line="1524"/>
+        <location filename="../qt-ui/models.cpp" line="1482"/>
+        <location filename="../qt-ui/models.cpp" line="1530"/>
         <source>Location</source>
         <translation>Local</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>Depth(%1)</source>
         <translation>Profundidade(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1449"/>
-        <location filename="../qt-ui/models.cpp" line="1495"/>
+        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1501"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1498"/>
+        <location filename="../qt-ui/models.cpp" line="1504"/>
         <source>Temp(%1%2)</source>
         <translation>Temperatura(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>lbs</source>
         <translation>libras</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1470"/>
-        <location filename="../qt-ui/models.cpp" line="1518"/>
+        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1524"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -2197,95 +2373,95 @@ remover o computador de mergulho seleccionado?</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="98"/>
         <source>no dives were selected</source>
         <translation>não foram seleccionados nenhuns mergulhos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="117"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>erro ao criar um ficheiro zip para upload&gt; %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="143"/>
         <source>cannot create temporary file: %s</source>
         <translation>não foi possível criar o ficheiro temporário: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/>
         <source>internal error: %s</source>
         <translation>erro interno: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="169"/>
         <source>internal error</source>
         <translation>erro interno</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="629"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="828"/>
         <source>Done</source>
         <translation>Concluído</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/>
         <source>Uploading dive list...</source>
         <translation>A carregar a lista dos mergulhos...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="692"/>
         <source>Downloading dive list...</source>
         <translation>A descarregar a lista dos mergulhos...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="741"/>
         <source>Downloading %1 dives...</source>
         <translation>A descarregar %1 mergulhos...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="785"/>
         <source>Download finished - %1</source>
         <translation>Descarga terminada - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="802"/>
         <source>Corrupted download</source>
         <translation>Descarga corrompida</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Não foi possível abrir o ficheiro:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
         <source>Upload failed</source>
         <translation>A exportação falhou</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/>
         <source>Upload successful</source>
         <translation>Exportação bem sucedida</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
         <source>Login failed</source>
         <translation>O login falhou</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
         <source>Cannot parse response</source>
         <translation>Não foi possível analisar a resposta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
         <source>Error: %1</source>
         <translation>Erro: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="829"/>
         <source>Upload finished</source>
         <translation>Carregamento terminado</translation>
     </message>
@@ -2293,54 +2469,52 @@ remover o computador de mergulho seleccionado?</translation>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="169"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="400"/>
         <source>Retry</source>
         <translation>Tentar novamente</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="264"/>
         <source>Find Uemis dive computer</source>
         <translation>Procurar computador de mergulho Uemis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Seleccione o ficheiro para descarregar os mergulhos do computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Log files (*.log)</source>
         <translation>Ficheiros log (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="362"/>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="363"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>Gravar a descarga do libdivecomputer não descarrega os mergulhos para a lista</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="374"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Seleccione o ficheiro para gravar a descarga binária do libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="375"/>
         <source>Dump files (*.bin)</source>
         <translation>Ficheiros dump (*.bin)</translation>
     </message>
@@ -2348,7 +2522,7 @@ remover o computador de mergulho seleccionado?</translation>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="101"/>
         <source>Vendor</source>
         <translation>Marca</translation>
     </message>
@@ -2358,54 +2532,74 @@ remover o computador de mergulho seleccionado?</translation>
         <translation>Transferir do computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="31"/>
         <source>Device or mount point</source>
         <translation>Dispositivo ou ponto de montagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="111"/>
         <source>Dive computer</source>
         <translation>Computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="132"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="45"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="80"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="94"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="52"/>
         <source>Force download of all dives</source>
         <translation>Forçar a transferência de todos os mergulhos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
         <source>Always prefer downloaded dives</source>
         <translation>Preferir sempre os mergulhos já transferidos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="189"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/>
+        <source>Downloaded Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
+        <source>Select all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
+        <source>Unselect all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
         <source>Save libdivecomputer logfile</source>
         <translation>Gravar registo do libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="87"/>
         <source>Save libdivecomputer dumpfile</source>
         <translation>Gravar ficheiro em bruto do libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
         <source>Download into new trip</source>
         <translation>Decarregar para uma viagem nova</translation>
     </message>
@@ -2413,12 +2607,12 @@ remover o computador de mergulho seleccionado?</translation>
 <context>
     <name>ExtraDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Key</source>
         <translation>Chave</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Value</source>
         <translation>Valor</translation>
     </message>
@@ -2432,22 +2626,20 @@ remover o computador de mergulho seleccionado?</translation>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="245"/>
-        <source>Your dive profile was updated to facebook.</source>
-        <translation>O seu perfil de mergulho foi carregado para o facebook</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
-        <source>Photo Upload Failed</source>
-        <translation>O carregamento das fotos falhou</translation>
+        <source>Your dive profile was updated to Facebook.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="250"/>
-        <source>Your dive profile was not updated to facebook, 
+        <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
-        <translation>O seu perfil de mergulho não foi carregado para o facebook,
-por favor envie a seguinte informação aos desenvolvedores do Subsurface. 
-</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+        <source>Photo Upload Failed</source>
+        <translation>O carregamento das fotos falhou</translation>
     </message>
 </context>
 <context>
@@ -2489,17 +2681,17 @@ por favor envie a seguinte informação aos desenvolvedores do Subsurface.
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1544"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1621"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Esta característica não está ainda disponível para o computador de mergulho seleccionado.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1624"/>
         <source>Firmware update failed!</source>
         <translation>A actualização do firmware falhou!</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1550"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1627"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Não foi possível estabelecer a ligação com o computador de mergulho</translation>
     </message>
@@ -2507,7 +2699,7 @@ por favor envie a seguinte informação aos desenvolvedores do Subsurface.
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="128"/>
+        <location filename="../qt-ui/globe.cpp" line="119"/>
         <source>Edit selected dive locations</source>
         <translation>Editar locais seleccionados</translation>
     </message>
@@ -2515,7 +2707,7 @@ por favor envie a seguinte informação aos desenvolvedores do Subsurface.
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="566"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="549"/>
         <source>Location: </source>
         <translation>Local:</translation>
     </message>
@@ -2523,7 +2715,7 @@ por favor envie a seguinte informação aos desenvolvedores do Subsurface.
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="286"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="283"/>
         <source>No location set</source>
         <translation>Não foi definido um local</translation>
     </message>
@@ -2531,330 +2723,335 @@ por favor envie a seguinte informação aos desenvolvedores do Subsurface.
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="133"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
+        <location filename="../qt-ui/maintab.cpp" line="497"/>
         <source>Location</source>
         <translation>Local</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="67"/>
         <source>Coordinates</source>
         <translation>Coordenadas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="169"/>
         <source>Divemaster</source>
         <translation>Guia de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="154"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Buddy</source>
         <translation>Companheiros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="222"/>
+        <location filename="../qt-ui/maintab.ui" line="277"/>
         <source>Tags</source>
         <translation>Etiquetas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="186"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
         <source>Rating</source>
         <translation>Classificação</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="221"/>
         <source>Visibility</source>
         <translation>Visibilidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="230"/>
         <source>Suit</source>
         <translation>Fato</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="465"/>
+        <location filename="../qt-ui/maintab.cpp" line="470"/>
         <source>Dive notes</source>
         <translation>Notas do mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
-        <location filename="../qt-ui/maintab.ui" line="648"/>
-        <location filename="../qt-ui/maintab.cpp" line="277"/>
+        <location filename="../qt-ui/maintab.ui" line="74"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="102"/>
+        <location filename="../qt-ui/maintab.ui" line="677"/>
+        <location filename="../qt-ui/maintab.cpp" line="279"/>
         <source>Air temp.</source>
         <translation>Temp. do ar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <location filename="../qt-ui/maintab.ui" line="667"/>
-        <location filename="../qt-ui/maintab.cpp" line="278"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.ui" line="696"/>
+        <location filename="../qt-ui/maintab.cpp" line="280"/>
         <source>Water temp.</source>
         <translation>Temp. da água</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="229"/>
-        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.ui" line="284"/>
+        <location filename="../qt-ui/maintab.cpp" line="498"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="369"/>
+        <location filename="../qt-ui/maintab.ui" line="398"/>
         <source>Equipment</source>
         <translation>Equipamento</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="496"/>
+        <location filename="../qt-ui/maintab.ui" line="525"/>
         <source>Gases used</source>
         <translation>Gases usados</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="515"/>
+        <location filename="../qt-ui/maintab.ui" line="544"/>
         <source>Gas consumed</source>
         <translation>Gás consumido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="553"/>
+        <location filename="../qt-ui/maintab.ui" line="582"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="591"/>
+        <location filename="../qt-ui/maintab.ui" line="620"/>
         <source>Max. depth</source>
         <translation>Prof. Max.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="629"/>
+        <location filename="../qt-ui/maintab.ui" line="658"/>
         <source>Air pressure</source>
         <translation>Pressão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="686"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>Dive time</source>
         <translation>Duração do mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="845"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
         <source>Total time</source>
         <translation>Tempo total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="903"/>
+        <location filename="../qt-ui/maintab.ui" line="932"/>
         <source>Gas consumption</source>
         <translation>Consumo de gás</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="962"/>
+        <location filename="../qt-ui/maintab.ui" line="991"/>
         <source>Extra data</source>
         <translation>Dados extra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="968"/>
+        <location filename="../qt-ui/maintab.ui" line="997"/>
         <source>Additional data from dive computer</source>
         <translation>Dados adicionais do computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="54"/>
-        <location filename="../qt-ui/maintab.ui" line="458"/>
+        <location filename="../qt-ui/maintab.ui" line="83"/>
+        <location filename="../qt-ui/maintab.ui" line="487"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="61"/>
+        <location filename="../qt-ui/maintab.ui" line="90"/>
         <source>Time</source>
         <translation>Tempo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="425"/>
+        <location filename="../qt-ui/maintab.ui" line="454"/>
         <source>Dive info</source>
         <translation>Informações sobre o mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="477"/>
+        <location filename="../qt-ui/maintab.ui" line="506"/>
         <source>Interval</source>
         <translation>Intervalo de superfície</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="534"/>
-        <location filename="../qt-ui/maintab.ui" line="799"/>
+        <location filename="../qt-ui/maintab.ui" line="563"/>
+        <location filename="../qt-ui/maintab.ui" line="828"/>
         <source>SAC</source>
         <translation>Consumo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="610"/>
+        <location filename="../qt-ui/maintab.ui" line="639"/>
         <source>Avg. depth</source>
         <translation>Prof. média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="572"/>
+        <location filename="../qt-ui/maintab.ui" line="601"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="734"/>
         <source>Salinity</source>
         <translation>Salinidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="742"/>
+        <location filename="../qt-ui/maintab.ui" line="771"/>
         <source>Stats</source>
         <translation>Estatísticas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="775"/>
+        <location filename="../qt-ui/maintab.ui" line="804"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="787"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="813"/>
+        <location filename="../qt-ui/maintab.ui" line="842"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="864"/>
+        <location filename="../qt-ui/maintab.ui" line="893"/>
         <source>Dives</source>
         <translation>Mergulhos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="948"/>
+        <location filename="../qt-ui/maintab.ui" line="977"/>
         <source>Photos</source>
         <translation>Fotos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="95"/>
+        <location filename="../qt-ui/maintab.cpp" line="87"/>
         <source>Cylinders</source>
         <translation>Garrafas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="99"/>
+        <location filename="../qt-ui/maintab.cpp" line="91"/>
         <source>Weights</source>
         <translation>Lastro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="55"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Apply changes</source>
         <translation>Aplicar alterações</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="59"/>
+        <location filename="../qt-ui/maintab.cpp" line="50"/>
         <source>Discard changes</source>
         <translation>Descartar alterações</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="96"/>
+        <location filename="../qt-ui/maintab.cpp" line="88"/>
         <source>Add cylinder</source>
         <translation>Adicionar garrafa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="100"/>
+        <location filename="../qt-ui/maintab.cpp" line="92"/>
         <source>Add weight system</source>
         <translation>Adicionar sistema de lastro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="274"/>
+        <location filename="../qt-ui/maintab.cpp" line="276"/>
         <source>Air temp. [%1]</source>
         <translation>Temp. do ar [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="275"/>
+        <location filename="../qt-ui/maintab.cpp" line="277"/>
         <source>Water temp. [%1]</source>
         <translation>Temp. da água [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="312"/>
+        <location filename="../qt-ui/maintab.cpp" line="314"/>
         <source>This trip is being edited.</source>
         <translation>Esta viagem está a ser editada.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="320"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Multiple dives are being edited.</source>
         <translation>Estão a ser editados vários mergulhos.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.cpp" line="324"/>
         <source>This dive is being edited.</source>
         <translation>Este mergulho está a ser editado.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="436"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
+        <location filename="../qt-ui/maintab.cpp" line="465"/>
         <source>Trip notes</source>
         <translation>Notas sobre a viagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="458"/>
+        <location filename="../qt-ui/maintab.cpp" line="463"/>
         <source>Trip location</source>
         <translation>Local da viagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="526"/>
-        <location filename="../qt-ui/maintab.cpp" line="558"/>
-        <location filename="../qt-ui/maintab.cpp" line="562"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
         <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="574"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="555"/>
+        <location filename="../qt-ui/maintab.cpp" line="563"/>
         <source>Deepest dive</source>
         <translation>Mergulho mais fundo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="556"/>
+        <location filename="../qt-ui/maintab.cpp" line="564"/>
         <source>Shallowest dive</source>
         <translation>Mergulho menos fundo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="569"/>
+        <location filename="../qt-ui/maintab.cpp" line="577"/>
         <source>Highest total SAC of a dive</source>
         <translation>Consumo mais elevado num mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="578"/>
         <source>Lowest total SAC of a dive</source>
         <translation>Consumo mais baixo num mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="571"/>
+        <location filename="../qt-ui/maintab.cpp" line="579"/>
         <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="582"/>
+        <location filename="../qt-ui/maintab.cpp" line="590"/>
         <source>Highest temperature</source>
         <translation>Temperatura mais elevada</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="583"/>
+        <location filename="../qt-ui/maintab.cpp" line="591"/>
         <source>Lowest temperature</source>
         <translation>Temperatura mais baixa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="584"/>
+        <location filename="../qt-ui/maintab.cpp" line="592"/>
         <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="594"/>
+        <location filename="../qt-ui/maintab.cpp" line="602"/>
         <source>Longest dive</source>
         <translation>Mergulho mais longo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="595"/>
+        <location filename="../qt-ui/maintab.cpp" line="603"/>
         <source>Shortest dive</source>
         <translation>Mergulho mais curto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="596"/>
+        <location filename="../qt-ui/maintab.cpp" line="604"/>
         <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="620"/>
+        <location filename="../qt-ui/maintab.cpp" line="628"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -2863,17 +3060,17 @@ obtidos a partir do ar usando:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="624"/>
+        <location filename="../qt-ui/maintab.cpp" line="632"/>
         <source> and </source>
         <translation>e</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="911"/>
+        <location filename="../qt-ui/maintab.cpp" line="925"/>
         <source>Discard the changes?</source>
         <translation>Eliminar as alterações?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="912"/>
+        <location filename="../qt-ui/maintab.cpp" line="926"/>
         <source>You are about to discard your changes.</source>
         <translation>Está prestes a eliminar as alterações.</translation>
     </message>
@@ -3020,7 +3217,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="296"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="232"/>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
@@ -3380,90 +3577,90 @@ p, li { white-space: pre-wrap; }
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="252"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="229"/>
         <source>Open file</source>
         <translation>Abrir Ficheiro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="256"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="233"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="332"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="309"/>
         <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="444"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
         <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="491"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
         <source>Print runtime table</source>
         <translation>Imprimir tabela de runtime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="834"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="811"/>
         <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="836"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="813"/>
         <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="841"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="818"/>
         <source>Save changes?</source>
         <translation>Guardar alterações?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1196"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1173"/>
         <source>Save file as</source>
         <translation>Guardar ficheiro como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1337"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1314"/>
         <source>Open dive log file</source>
         <translation>Abrir ficheiro de registo de mergulhos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="819"/>
         <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="300"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="444"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="277"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1180"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1157"/>
         <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="625"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="602"/>
         <source>Yearly statistics</source>
         <translation>Estatísticas anuais</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1197"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1174"/>
         <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="1338"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1315"/>
         <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source>
         <translation>Ficheiros de logbook (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Ficheiros Cochran (*.can);;Ficheiros CSV (*.csv);;Ficheiros DiveLog.de (*.dld);;Ficheiros JDiveLog (*.jlb);;Ficheiros Liquivision (*.lvd);;Ficheiros MkVI (*.txt);;Ficheiros Suunto (*.sde *.db);;Ficheiros Divesoft (*.dlf);;Ficheiros UDDF/UDCF (*.uddf *.udcf);;Ficheiros XML (*.xml);;Todos os ficheiros (*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <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>
@@ -3471,7 +3668,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="651"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="634"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>O filtro mostra %1 (de %2) mergulhos</translation>
     </message>
@@ -3479,12 +3676,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="239"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation>Deve actualizar o firmware no seu computador de mergulho: tem a versão %1 mas a última versão estável é a %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="243"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
@@ -3493,27 +3690,27 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que para a descarga de um logbook antes de continuar com a actualização</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="244"/>
         <source>Not now</source>
         <translation>Agora não</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="245"/>
         <source>Update firmware</source>
         <translation>Actualizar firmware</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
         <source>Firmware upgrade notice</source>
         <translation>Alerta de upgrade de firmware</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
         <source>Save the downloaded firmware as</source>
         <translation>Gravar o firmware descarregado como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
         <source>HEX files (*.hex)</source>
         <translation>Ficheiros HEX (*.hex)</translation>
     </message>
@@ -3521,54 +3718,69 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Open circuit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="481"/>
         <source>Last stop at 20ft</source>
         <translation>Última paragem aos 20 ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="482"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% da profundidade média para 6 m/20 ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="489"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
         <source>20ft to surface</source>
         <translation>6 m/20 ft para a superfície</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="485"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
         <source>Last stop at 6m</source>
         <translation>Última paragem aos 6 m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% da profundidade média para 6 m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="494"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
         <source>6m to surface</source>
         <translation>6 m para a superfície</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="497"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="498"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
         <source>cuft/min</source>
         <translation>cuft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="506"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="507"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="500"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="501"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
@@ -3687,6 +3899,7 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="816"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -3721,57 +3934,87 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="795"/>
+        <source>CCR: Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="809"/>
+        <source>Default CCR set-point for dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="832"/>
+        <source>pSCR O₂ metabolism rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="839"/>
+        <source>pSCR ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="846"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="859"/>
+        <source>1:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="875"/>
         <source>System default</source>
         <translation>Linguagem do sistema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="843"/>
+        <location filename="../qt-ui/preferences.ui" line="914"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="849"/>
+        <location filename="../qt-ui/preferences.ui" line="920"/>
         <source>Proxy type</source>
         <translation>Tipo de proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="862"/>
+        <location filename="../qt-ui/preferences.ui" line="933"/>
         <source>Host</source>
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="888"/>
+        <location filename="../qt-ui/preferences.ui" line="959"/>
         <source>Port</source>
         <translation>Porta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="914"/>
+        <location filename="../qt-ui/preferences.ui" line="985"/>
         <source>Requires authentication</source>
         <translation>Requer autenticação</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="934"/>
+        <location filename="../qt-ui/preferences.ui" line="1005"/>
         <source>Username</source>
         <translation>Nome de utilizador</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="957"/>
+        <location filename="../qt-ui/preferences.ui" line="1028"/>
         <source>Password</source>
         <translation>Palavra-passe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="985"/>
-        <source>about:blank</source>
-        <translation>sobre:blank</translation>
+        <location filename="../qt-ui/preferences.ui" line="1079"/>
+        <source>Disconnect from Facebook</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1011"/>
-        <source>Disconnect from facebook</source>
-        <translation>Desconectado do facebook</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="824"/>
+        <location filename="../qt-ui/preferences.ui" line="895"/>
         <source>Filter</source>
         <translation>Filtros</translation>
     </message>
@@ -3926,52 +4169,52 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="28"/>
+        <location filename="../qt-ui/preferences.cpp" line="44"/>
         <source>No proxy</source>
         <translation>Sem proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="29"/>
+        <location filename="../qt-ui/preferences.cpp" line="45"/>
         <source>System proxy</source>
         <translation>Proxy do sistema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="30"/>
+        <location filename="../qt-ui/preferences.cpp" line="46"/>
         <source>HTTP proxy</source>
         <translation>Proxy HTTP</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="31"/>
+        <location filename="../qt-ui/preferences.cpp" line="47"/>
         <source>SOCKS proxy</source>
         <translation>Proxy SOCKS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="291"/>
+        <location filename="../qt-ui/preferences.cpp" line="324"/>
         <source>Restart required</source>
         <translation>É necessário reiniciar a aplicação</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="292"/>
+        <location filename="../qt-ui/preferences.cpp" line="325"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>Para alterar a linguagem é necessário reiniciar o Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="456"/>
+        <location filename="../qt-ui/preferences.cpp" line="494"/>
         <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
         <translation>Se clicar OK, todas as definições do Subsurface serão reinicializadas para os seus valores padrão. Isto será aplicado imediatamente.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Ficheiro XML do Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Open default log file</source>
         <translation>Abrir ficheiro de registo de mergulhos padrão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="455"/>
+        <location filename="../qt-ui/preferences.cpp" line="493"/>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
@@ -3979,17 +4222,17 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="91"/>
+        <location filename="../qt-ui/printdialog.cpp" line="85"/>
         <source>&amp;Preview</source>
         <translation>&amp;Previsão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="88"/>
+        <location filename="../qt-ui/printdialog.cpp" line="82"/>
         <source>P&amp;rint</source>
         <translation>Im&amp;primir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="103"/>
+        <location filename="../qt-ui/printdialog.cpp" line="97"/>
         <source>Print</source>
         <translation>Imprimir</translation>
     </message>
@@ -3997,42 +4240,42 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="20"/>
         <source>Dive#</source>
         <translation>Mergulho #</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="21"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="22"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="23"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Master</source>
         <translation>Padrão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Buddy</source>
         <translation>Companheiros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="34"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Location</source>
         <translation>Localização</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <location filename="../qt-ui/printlayout.cpp" line="63"/>
         <source>Subsurface cannot find a usable printer on this system!</source>
         <translation>O Subsurface não encontrou uma impressora ligada a este sistema! </translation>
     </message>
@@ -4098,72 +4341,72 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2095"/>
+        <location filename="../qt-ui/models.cpp" line="2101"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2100"/>
+        <location filename="../qt-ui/models.cpp" line="2106"/>
         <source>Dive #%1 - %2</source>
         <translation>Mergulho #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2103"/>
+        <location filename="../qt-ui/models.cpp" line="2109"/>
         <source>Max depth: %1 %2</source>
         <translation>Prof. Máxima: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2110"/>
+        <location filename="../qt-ui/models.cpp" line="2116"/>
         <source>Duration: %1 min</source>
         <translation>Duração: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2115"/>
+        <location filename="../qt-ui/models.cpp" line="2121"/>
         <source>Gas used:</source>
         <translation>Gás usado:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2117"/>
+        <location filename="../qt-ui/models.cpp" line="2123"/>
         <source>Tags:</source>
         <translation>Etiquetas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2119"/>
+        <location filename="../qt-ui/models.cpp" line="2125"/>
         <source>SAC:</source>
         <translation>Consumo:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2121"/>
+        <location filename="../qt-ui/models.cpp" line="2127"/>
         <source>Weights:</source>
         <translation>Lastro:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2126"/>
+        <location filename="../qt-ui/models.cpp" line="2132"/>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2133"/>
+        <location filename="../qt-ui/models.cpp" line="2139"/>
         <source>Divemaster:</source>
         <translation>Guia:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2135"/>
+        <location filename="../qt-ui/models.cpp" line="2141"/>
         <source>Buddy:</source>
         <translation>Companheiros:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2137"/>
+        <location filename="../qt-ui/models.cpp" line="2143"/>
         <source>Suit:</source>
         <translation>Fato:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2139"/>
+        <location filename="../qt-ui/models.cpp" line="2145"/>
         <source>Viz:</source>
         <translation>Visibilidade:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2141"/>
+        <location filename="../qt-ui/models.cpp" line="2147"/>
         <source>Rating:</source>
         <translation>Classificação:</translation>
     </message>
@@ -4171,103 +4414,108 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="628"/>
         <source> (#%1 of %2)</source>
         <translation>(#%1 of %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="630"/>
+        <source>Unknown dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="647"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>A visualização do NDL /TTS foi desactivada devido ao excessivo tempo de processamento</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1168"/>
         <source>Make first divecomputer</source>
         <translation>Tornar como primeiro computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Delete this divecomputer</source>
         <translation>Eliminar este computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1184"/>
         <source>Add gas change</source>
         <translation>Adicionar mudança de gás</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1187"/>
         <source> (Tank %1)</source>
         <translation>(Garrafa %1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1195"/>
         <source>Add set-point change</source>
         <translation>Adicionar alteração do set-point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1197"/>
         <source>Add bookmark</source>
         <translation>Adicionar marcador</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
         <source>Remove event</source>
         <translation>Remover evento</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1206"/>
         <source>Hide similar events</source>
         <translation>Esconder eventos semelhantes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1213"/>
         <source>Edit name</source>
         <translation>Editar nome</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1242"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1249"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>Ajustar pressão da garrafa %1 (actualmente interpolada como %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1264"/>
         <source>Unhide all events</source>
         <translation>Mostrar todos os eventos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide events</source>
         <translation>Ocultar eventos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide all %1 events?</source>
         <translation>Ocultar todos os %1 eventos?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1333"/>
         <source>Remove the selected event?</source>
         <translation>Remover o evento seleccionado?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1334"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1424"/>
         <source>Edit name of bookmark</source>
         <translation>Editar nome do marcador</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
         <source>Custom name:</source>
         <translation>Nome personalizado:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1430"/>
         <source>Name is too long!</source>
         <translation>O nome é demasiado comprido!</translation>
     </message>
@@ -4275,102 +4523,102 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>AIR</source>
         <translation>Ar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>OXYGEN</source>
         <translation>OXIGÉNIO</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="208"/>
         <source>Remove this point</source>
         <translation>Remover este ponto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="57"/>
         <source>Close</source>
         <translation>Encerrar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="42"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="25"/>
         <source>Average</source>
         <translation>Média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="45"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="28"/>
         <source>Minimum</source>
         <translation>Mínima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="48"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="31"/>
         <source>Maximum</source>
         <translation>Máxima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="297"/>
+        <location filename="../qt-ui/globe.cpp" line="296"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>Mova o mapa e dê um duplo clique para definir o local de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="525"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="526"/>
         <source>lbs</source>
         <translation>libra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="550"/>
         <source>ft</source>
         <translation>pé</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="551"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="570"/>
+        <location filename="../qt-ui/models.cpp" line="574"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="571"/>
+        <location filename="../qt-ui/models.cpp" line="575"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="595"/>
+        <location filename="../qt-ui/models.cpp" line="599"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="596"/>
+        <location filename="../qt-ui/models.cpp" line="600"/>
         <source>cuft</source>
         <translation>pé cúbico</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="513"/>
         <source>Invalid response from server</source>
         <translation>Resposta inválida do servidor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation>Esperada a tag XML &apos;DiveDateReader&apos;. Em vez disso foi recebida a &apos;%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="567"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation>A tag XML esperada &apos;DiveDates&apos; não foi encontrada</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Resposta XML mal formada. Linha %1: %2</translation>
     </message>
@@ -4378,12 +4626,12 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1450"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1518"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Esta característica não está ainda disponível para o computador de mergulho seleccionado.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1442"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Não foi possível estabelecer uma ligação ao computador de mergulho.</translation>
     </message>
@@ -4397,12 +4645,12 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
-        <location filename="../qt-ui/simplewidgets.cpp" line="151"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="134"/>
         <source>New starting number</source>
         <translation>Novo número inicial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="149"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="132"/>
         <source>New number</source>
         <translation>Novo número</translation>
     </message>
@@ -4410,12 +4658,12 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1575"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1653"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Esta característica não está ainda disponível para o computador de mergulho seleccionado.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1579"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1657"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Não foi possível estabelecer uma ligação ao computador de mergulho.</translation>
     </message>
@@ -4494,12 +4742,12 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
         <translation>Que data e hora estão representados na imagem?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="276"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="259"/>
         <source>Open image file</source>
         <translation>Abrir imagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="278"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="261"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Ficheiros de imagem (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -4552,10 +4800,9 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
     <name>SocialNetworkDialog</name>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="282"/>
-        <source>Dive Date: %1 
+        <source>Dive date: %1 
 </source>
-        <translation>Data do mergulho: %1
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="285"/>
@@ -4578,10 +4825,9 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="290"/>
-        <source>Dive Location: %1 
+        <source>Dive location: %1 
 </source>
-        <translation>Local do mergulho: %1
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="293"/>
@@ -4699,47 +4945,47 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="329"/>
         <source>Webservice</source>
         <translation>Serviço web</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="393"/>
         <source>Connecting...</source>
         <translation>A ligar ...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
         <source>Download finished</source>
         <translation>Descarga terminada</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Download error: %1</source>
         <translation>Erro na descarga: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="436"/>
         <source>Connection error: </source>
         <translation>Erro de ligação:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
         <source>Download successful</source>
         <translation>Transferência bem sucedida</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="439"/>
         <source>Invalid user identifier!</source>
         <translation>Identificação de utilizador inválida !</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="312"/>
         <source>Enter User ID and click Download</source>
         <translation>Introduza o ID do utilizador e clique em &quot;Download&quot;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="442"/>
         <source>Cannot parse response!</source>
         <translation>Não foi possível analisar a resposta !</translation>
     </message>
@@ -4747,7 +4993,7 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="592"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="575"/>
         <source>Suits: </source>
         <translation>Fatos:</translation>
     </message>
@@ -4755,7 +5001,7 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="119"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="116"/>
         <source>No suit set</source>
         <translation>Fato não definido</translation>
     </message>
@@ -4772,7 +5018,7 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="513"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="496"/>
         <source>Tags: </source>
         <translation>Etiquetas:</translation>
     </message>
@@ -4780,7 +5026,7 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="144"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="141"/>
         <source>Empty tags</source>
         <translation>Sem etiquetas</translation>
     </message>
@@ -4788,17 +5034,17 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -4806,7 +5052,7 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="141"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="131"/>
         <source>Information</source>
         <translation>Informação</translation>
     </message>
@@ -4814,7 +5060,7 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1090"/>
+        <location filename="../qt-ui/models.cpp" line="1094"/>
         <source> (%1 shown)</source>
         <translation>(%1 mostrados)</translation>
     </message>
@@ -4822,72 +5068,72 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="64"/>
         <source>Check for updates.</source>
         <translation>Procurar actualizações</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="66"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Não foi possível encontrar actualizações para o Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="70"/>
         <source>The following error occurred:</source>
         <translation>Ocorreu o seguinte erro :</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="72"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
         <source>Please check your internet connection.</source>
         <translation>Por favor, verifique a ligação à Internet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="85"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="84"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>Está a usar a última versão do Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="88"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>Está disponível uma nova versão do Subsurface.&lt;br/&gt;Clique em:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; para a descarregar.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="95"/>
         <source>A new version of Subsurface is available.</source>
         <translation>Está disponível uma nova versão do Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="97"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
         <source>Latest version is %1, please check with your OS vendor for updates.</source>
         <translation>A última versão é %1. Por favor verifique com o vendedor do sistema operativo a existência de actualizações.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="103"/>
         <source>Newest release version is </source>
         <translation>A última versão lançada foi </translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="105"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
         <source>The server returned the following information:</source>
         <translation>O servidor retornou a informação seguinte:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="121"/>
         <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation>O Subsurface verifica a existência de novas versões a cada duas semanas. Se não desejar que tal aconteça, por favor clique em Declinar.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
         <source>Decline</source>
         <translation>Declinar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="124"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
         <source>Accept</source>
         <translation>Aceitar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="126"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="125"/>
         <source>Automatic check for updates</source>
         <translation>Verificar automaticamente a existência de actualizações</translation>
     </message>
@@ -4895,13 +5141,13 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
 <context>
     <name>UserManual</name>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="55"/>
+        <location filename="../qt-ui/usermanual.cpp" line="54"/>
         <source>User Manual</source>
         <translation>Manual do utilizador</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="72"/>
-        <location filename="../qt-ui/usermanual.cpp" line="78"/>
+        <location filename="../qt-ui/usermanual.cpp" line="71"/>
+        <location filename="../qt-ui/usermanual.cpp" line="77"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Não foi possível encontrar o manual do Subsurface</translation>
     </message>
@@ -4979,85 +5225,85 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
         <translation>De onde importa os seus dados de mergulho?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
         <source>
 Operating System: %1</source>
         <translation>
 Sistema operativo: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 Arquitectura do CPU: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 Language: %1</source>
         <translation>
 Linguagem: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="93"/>
         <source>Should we ask you later?</source>
         <translation>Deveríamos perguntar-lhe mais tarde?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Don&apos;t ask me again</source>
         <translation>Não me voltem a perguntar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Ask later</source>
         <translation>Perguntar mais tarde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
         <source>Submit user survey.</source>
         <translation>Enviar questionário do utilizador.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask again?</source>
         <translation>Perguntar novamente?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="17"/>
         <source>Send</source>
         <translation>Enviar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>
 Arquitectura do CPU e SO: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation>Não foi possível enviar o questionário do utilizador.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="121"/>
         <source>The following error occurred:</source>
         <translation>Ocorreu o seguinte erro:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>Please check your internet connection.</source>
         <translation>Por favor, verifique a sua ligação à internet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="131"/>
         <source>Survey successfully submitted.</source>
         <translation>Questionário enviado.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="136"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation>Ocorreu um erro na tentativa de procura de actualizações.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -5065,12 +5311,12 @@ Arquitectura do CPU e SO: %1</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -5118,12 +5364,12 @@ Arquitectura do CPU e SO: %1</translation>
         <translation>Carregar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="247"/>
         <source>Operation timed out</source>
         <translation>A operação demorou demasiado tempo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="268"/>
         <source>Transferring data...</source>
         <translation>A transferir dados...</translation>
     </message>
@@ -5131,17 +5377,17 @@ Arquitectura do CPU e SO: %1</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="496"/>
+        <location filename="../qt-ui/models.cpp" line="500"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Ao clicar aqui irá remover este sistema de lastro</translation>
     </message>
@@ -5149,19 +5395,19 @@ Arquitectura do CPU e SO: %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1479"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1487"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1497"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1555"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1566"/>
         <source>Failed!</source>
         <translation>Falhou!</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1506"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1576"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Esta característica não está ainda disponível para o computador de mergulho seleccionado.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1580"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Não foi possível estabelecer uma ligação ao computador de mergulho.</translation>
     </message>
@@ -5169,79 +5415,79 @@ Arquitectura do CPU e SO: %1</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1841"/>
+        <location filename="../qt-ui/models.cpp" line="1847"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Ano
 &gt;Mês / Viagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1844"/>
+        <location filename="../qt-ui/models.cpp" line="1850"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1847"/>
+        <location filename="../qt-ui/models.cpp" line="1853"/>
         <source>Duration 
  Total</source>
         <translation>Duração
 Total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1850"/>
+        <location filename="../qt-ui/models.cpp" line="1856"/>
         <source>
 Average</source>
         <translation>
 Média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1853"/>
+        <location filename="../qt-ui/models.cpp" line="1859"/>
         <source>
 Shortest</source>
         <translation>
 Mais curto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1856"/>
+        <location filename="../qt-ui/models.cpp" line="1862"/>
         <source>
 Longest</source>
         <translation>
 Mais longo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1859"/>
+        <location filename="../qt-ui/models.cpp" line="1865"/>
         <source>Depth (%1)
  Average</source>
         <translation>Profundidade (%1)
 Média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1862"/>
-        <location filename="../qt-ui/models.cpp" line="1871"/>
-        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>
 Minimum</source>
         <translation>
 Mínimo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1865"/>
-        <location filename="../qt-ui/models.cpp" line="1874"/>
-        <location filename="../qt-ui/models.cpp" line="1883"/>
+        <location filename="../qt-ui/models.cpp" line="1871"/>
+        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>
 Maximum</source>
         <translation>
 Máximo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1874"/>
         <source>SAC (%1)
  Average</source>
         <translation>Consumo (%1)
 Médio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1883"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temperatura (%1)
@@ -5322,40 +5568,40 @@ Média</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1508"/>
+        <location filename="../dive.c" line="1530"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) ou (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="464"/>
+        <location filename="../divelist.c" line="467"/>
         <location filename="../equipment.c" line="81"/>
-        <location filename="../planner.c" line="1060"/>
-        <location filename="../planner.c" line="1063"/>
+        <location filename="../planner.c" line="1081"/>
+        <location filename="../planner.c" line="1084"/>
         <source>air</source>
         <translation>ar</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="192"/>
+        <location filename="../equipment.c" line="194"/>
         <source>integrated</source>
         <translation>integrado</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="193"/>
+        <location filename="../equipment.c" line="195"/>
         <source>belt</source>
         <translation>cinto</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="194"/>
+        <location filename="../equipment.c" line="196"/>
         <source>ankle</source>
         <translation>tornozelo</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="195"/>
+        <location filename="../equipment.c" line="197"/>
         <source>backplate weight</source>
         <translation>lastro no arnês</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="196"/>
+        <location filename="../equipment.c" line="198"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -5363,7 +5609,7 @@ Média</translation>
         <location filename="../file.c" line="112"/>
         <location filename="../file.c" line="434"/>
         <location filename="../file.c" line="506"/>
-        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="925"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Falha na leitura de &apos;%s&apos;</translation>
     </message>
@@ -5420,9 +5666,9 @@ 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="../file.c" line="869"/>
-        <location filename="../file.c" line="909"/>
-        <location filename="../file.c" line="1007"/>
+        <location filename="../file.c" line="870"/>
+        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="1016"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>O número máximo de colunas suportadas ao importar ficheiros CSV é %d</translation>
     </message>
@@ -5593,27 +5839,27 @@ Média</translation>
         <translation>Número de evento inválido</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="421"/>
+        <location filename="../libdivecomputer.c" line="419"/>
         <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="427"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Error registering the data</source>
         <translation>Erro no registo de dados</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="433"/>
         <source>Error parsing the datetime</source>
         <translation>Erro na análise da data/tempo</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Dive %d: %s</source>
         <translation>Mergulho nº %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="455"/>
+        <location filename="../libdivecomputer.c" line="454"/>
         <source>Error parsing the divetime</source>
         <translation>Erro na análise do tempo de mergulho</translation>
     </message>
@@ -5623,82 +5869,82 @@ Média</translation>
         <translation>Erro na análise da profundidade máxima</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="482"/>
+        <location filename="../libdivecomputer.c" line="483"/>
         <source>Error parsing temperature</source>
         <translation>Erro ao analisar tempetaturas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="501"/>
+        <location filename="../libdivecomputer.c" line="503"/>
         <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="513"/>
+        <location filename="../libdivecomputer.c" line="515"/>
         <source>Error obtaining water salinity</source>
         <translation>Erro na obtenção da salinidade da água</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="521"/>
+        <location filename="../libdivecomputer.c" line="524"/>
         <source>Error obtaining surface pressure</source>
         <translation>Erro na obtenção da pressão atmosférica</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="545"/>
+        <location filename="../libdivecomputer.c" line="549"/>
         <source>Error obtaining divemode</source>
         <translation>Erro na obtenção do modo de mergulho</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="562"/>
+        <location filename="../libdivecomputer.c" line="569"/>
         <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="569"/>
+        <location filename="../libdivecomputer.c" line="576"/>
         <source>Error parsing the samples</source>
         <translation>Erro na análise das amostras</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="706"/>
+        <location filename="../libdivecomputer.c" line="713"/>
         <source>Event: waiting for user action</source>
         <translation>Evento: à espera de acção do utilizador</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="714"/>
+        <location filename="../libdivecomputer.c" line="721"/>
         <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="778"/>
+        <location filename="../libdivecomputer.c" line="785"/>
         <source>Error registering the event handler.</source>
         <translation>Erro no registo do &quot;event handler&quot;.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="783"/>
+        <location filename="../libdivecomputer.c" line="790"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Erro no registo do &quot;cancellation handler&quot;.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="804"/>
+        <location filename="../libdivecomputer.c" line="811"/>
         <source>Dive data import error</source>
         <translation>Erro a importar os dados do mergulho</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="843"/>
+        <location filename="../libdivecomputer.c" line="850"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Não é possivel criar contexto do libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="850"/>
+        <location filename="../libdivecomputer.c" line="857"/>
         <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="858"/>
+        <location filename="../libdivecomputer.c" line="865"/>
         <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>
     <message>
-        <location filename="../parse-xml.c" line="506"/>
+        <location filename="../parse-xml.c" line="516"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Leitura estranha das percentagens %s
@@ -5706,84 +5952,84 @@ Média</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1760"/>
+        <location filename="../parse-xml.c" line="1770"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Falha na análise de &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1989"/>
-        <location filename="../parse-xml.c" line="2137"/>
+        <location filename="../parse-xml.c" line="1999"/>
+        <location filename="../parse-xml.c" line="2147"/>
         <source>Database query dm4_events failed.
 </source>
         <translation>A consulta à base de dados dm4_events falhou.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1996"/>
-        <location filename="../parse-xml.c" line="2144"/>
+        <location filename="../parse-xml.c" line="2006"/>
+        <location filename="../parse-xml.c" line="2154"/>
         <source>Database query dm4_tags failed.
 </source>
         <translation>A consulta à base de dados dm4_tags falhou.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2318"/>
+        <location filename="../parse-xml.c" line="2328"/>
         <source>Database query shearwater_cylinders failed.
 </source>
         <translation>A consulta à base de dados shearwater_cylinders falhou.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2325"/>
+        <location filename="../parse-xml.c" line="2335"/>
         <source>Database query shearwater_changes failed.
 </source>
         <translation>A consulta à base de dados shearwater_changes falhou.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2332"/>
+        <location filename="../parse-xml.c" line="2342"/>
         <source>Database query shearwater_profile_sample failed.
 </source>
         <translation>A consulta à base de dados shearwater_profile_sample falhou.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2451"/>
+        <location filename="../parse-xml.c" line="2461"/>
         <source>Database query cobalt_cylinders failed.
 </source>
         <translation>A consulta à base de dados cobalt_cylinders falhou.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2458"/>
+        <location filename="../parse-xml.c" line="2468"/>
         <source>Database query cobalt_buddies failed.
 </source>
         <translation>A consulta à base de dados cobalt_buddies falhou.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2465"/>
+        <location filename="../parse-xml.c" line="2475"/>
         <source>Database query cobalt_visibility failed.
 </source>
         <translation>A consulta à base de dados cobalt_visibility falhou.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2472"/>
+        <location filename="../parse-xml.c" line="2482"/>
         <source>Database query cobalt_location failed.
 </source>
         <translation>A consulta à base de dados cobalt_location falhou.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2479"/>
+        <location filename="../parse-xml.c" line="2489"/>
         <source>Database query cobalt_location (site) failed.
 </source>
         <translation>A consulta à base de dados cobalt_location(site) falhou.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2486"/>
+        <location filename="../parse-xml.c" line="2496"/>
         <source>Database query cobalt_profile_sample failed.
 </source>
         <translation>A consulta à base de dados cobalt_profile_sample falhou.
@@ -5797,17 +6043,17 @@ Média</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2168"/>
-        <location filename="../parse-xml.c" line="2189"/>
-        <location filename="../parse-xml.c" line="2508"/>
-        <location filename="../parse-xml.c" line="2527"/>
+        <location filename="../parse-xml.c" line="2178"/>
+        <location filename="../parse-xml.c" line="2199"/>
+        <location filename="../parse-xml.c" line="2518"/>
+        <location filename="../parse-xml.c" line="2537"/>
         <source>Database query failed '%s'.
 </source>
         <translation>A consulta da base de dados falhou &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2848"/>
+        <location filename="../parse-xml.c" line="2909"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Não é possível abrir a folha de estilos %s</translation>
     </message>
@@ -5817,162 +6063,168 @@ Média</translation>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="820"/>
+        <location filename="../planner.c" line="841"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Não foi possível encontrar o gás %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="356"/>
+        <location filename="../planner.c" line="363"/>
         <source>Too many gas mixes</source>
         <translation>Demasiadas misturas de gás</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="540"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation>O cálculo da descompressão foi terminado por esta ser demasiado longa</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="548"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation>Baseado num GFlow = %d e GFhigh = %d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="544"/>
+        <location filename="../planner.c" line="551"/>
         <source>Subsurface dive plan</source>
         <translation>Plano de mergulho Subsurface</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="548"/>
+        <location filename="../planner.c" line="555"/>
         <source>depth</source>
         <translation>profundidade</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="558"/>
         <source>runtime</source>
         <translation>runtime</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="554"/>
+        <location filename="../planner.c" line="561"/>
         <source>duration</source>
         <translation>duração</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="557"/>
+        <location filename="../planner.c" line="564"/>
         <source>gas</source>
         <translation>gás</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="594"/>
+        <location filename="../planner.c" line="601"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Transição para %.*f %s em %d:%02d min - runtime %d:%02u a %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="602"/>
+        <location filename="../planner.c" line="609"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Transição para %.*f %s em %d:%02d min - runtime %d:%02u com %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="615"/>
+        <location filename="../planner.c" line="622"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Permanecer a at %.*f %s durante %d:%02d min - runtime %d:%02u a %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="622"/>
+        <location filename="../planner.c" line="629"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Permanecer a %.*f %s for %d:%02d min - runtime %d:%02u com %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="635"/>
+        <location filename="../planner.c" line="642"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="638"/>
-        <location filename="../planner.c" line="642"/>
+        <location filename="../planner.c" line="645"/>
+        <location filename="../planner.c" line="649"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="651"/>
+        <location filename="../planner.c" line="658"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="676"/>
+        <location filename="../planner.c" line="683"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Trocar gás para %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="678"/>
+        <location filename="../planner.c" line="685"/>
         <source>Switch gas to %s</source>
         <translation>Mudar para %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="697"/>
+        <location filename="../planner.c" line="704"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="699"/>
+        <location filename="../planner.c" line="706"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="710"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Consumo de gás (excluídas as fases c/CCR):</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="705"/>
+        <location filename="../planner.c" line="712"/>
         <source>Gas consumption:</source>
         <translation>Consumo de gás:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="535"/>
-        <location filename="../planner.c" line="725"/>
-        <location filename="../planner.c" line="730"/>
-        <location filename="../planner.c" line="753"/>
+        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="732"/>
+        <location filename="../planner.c" line="737"/>
+        <location filename="../planner.c" line="762"/>
+        <location filename="../planner.c" line="772"/>
         <source>Warning:</source>
         <translation>Aviso:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="523"/>
+        <location filename="../planner.c" line="530"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
         <translation>Aviso: o planeamento de mergulhos através desta ferramenta baseia-se no algoritmo de Buehlmann. No entanto, esta implementação é recente e foi alvo de testes limitados.
 Recomenda-se aos utilizadores que não se baseiem apenas nesta ferramenta para planear os seus mergulhos.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="726"/>
+        <location filename="../planner.c" line="733"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>a quantidade de gás necessária excede a quantidade disponível na garrafa!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="731"/>
+        <location filename="../planner.c" line="738"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>a reserva de gás não é suficiente para ser partilhada durante a subida!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="733"/>
+        <location filename="../planner.c" line="740"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s na subida planeada)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="735"/>
+        <location filename="../planner.c" line="742"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s durante a subida planeada) de %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="759"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>valor pO₂ elevado %.2f em %d:%02u com gás %s à profundidade de %.*f %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="1064"/>
+        <location filename="../planner.c" line="769"/>
+        <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="1085"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1099"/>
+        <location filename="../profile.c" line="1113"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -5981,70 +6233,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1102"/>
+        <location filename="../profile.c" line="1116"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1106"/>
+        <location filename="../profile.c" line="1120"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1112"/>
+        <location filename="../profile.c" line="1126"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1115"/>
+        <location filename="../profile.c" line="1129"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1117"/>
+        <location filename="../profile.c" line="1131"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1119"/>
+        <location filename="../profile.c" line="1133"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1121"/>
+        <location filename="../profile.c" line="1135"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1123"/>
+        <location filename="../profile.c" line="1137"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1140"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1147"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -6054,7 +6306,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1137"/>
+        <location filename="../profile.c" line="1151"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -6064,49 +6316,49 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1149"/>
+        <location filename="../profile.c" line="1163"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Paragem de segurança: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1152"/>
+        <location filename="../profile.c" line="1166"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Paragem de segurança: tempo desconhecido @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1157"/>
+        <location filename="../profile.c" line="1171"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Descompressão: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1174"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Descompressão: tempo desconhecido @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1178"/>
         <source>In deco
 </source>
         <translation>Em descompressão
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1166"/>
+        <location filename="../profile.c" line="1180"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1183"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
@@ -6114,100 +6366,100 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1172"/>
+        <location filename="../profile.c" line="1186"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Descompressão:  %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1180"/>
+        <location filename="../profile.c" line="1194"/>
         <source>In deco (calc)
 </source>
         <translation>Em descompressão (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1196"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1185"/>
+        <location filename="../profile.c" line="1199"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1188"/>
+        <location filename="../profile.c" line="1202"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Tecto calculado %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1194"/>
+        <location filename="../profile.c" line="1208"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Tecido  %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1214"/>
         <source>heartbeat: %d
 </source>
         <translation>frequência cardíaca: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1202"/>
+        <location filename="../profile.c" line="1216"/>
         <source>bearing: %d
 </source>
         <translation>enfiamento: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1205"/>
+        <location filename="../profile.c" line="1219"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>profundidade média até aqui %.1f%f
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1314"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1304"/>
-        <location filename="../profile.c" line="1308"/>
-        <location filename="../profile.c" line="1312"/>
+        <location filename="../profile.c" line="1318"/>
+        <location filename="../profile.c" line="1322"/>
+        <location filename="../profile.c" line="1326"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1316"/>
+        <location filename="../profile.c" line="1330"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1334"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1324"/>
-        <location filename="../profile.c" line="1328"/>
+        <location filename="../profile.c" line="1338"/>
+        <location filename="../profile.c" line="1342"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1335"/>
+        <location filename="../profile.c" line="1349"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -6338,6 +6590,7 @@ EADD: %d%s
     </message>
     <message>
         <location filename="../dive.c" line="30"/>
+        <location filename="../equipment.c" line="85"/>
         <source>oxygen</source>
         <translation>oxigénio</translation>
     </message>
@@ -6392,97 +6645,97 @@ EADD: %d%s
         <translation>(nenhum mergulho)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Mon</source>
         <translation>Seg</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Tue</source>
         <translation>Ter</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Wed</source>
         <translation>Qua</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Thu</source>
         <translation>Qui</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Fri</source>
         <translation>Sex</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sat</source>
         <translation>Sáb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Feb</source>
         <translation>Fev</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Apr</source>
         <translation>Abr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Aug</source>
         <translation>Ago</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Sep</source>
         <translation>Set</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Oct</source>
         <translation>Out</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
@@ -7086,13 +7339,13 @@ O Uemis Zurich está bem ligado?</translation>
         <translation>Planeamento</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
         <source>GF low</source>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>%</source>
         <translation>%</translation>
     </message>
@@ -7102,7 +7355,7 @@ O Uemis Zurich está bem ligado?</translation>
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="335"/>
         <source>Drop to first depth</source>
         <translation>Descer para a primeira profundidade</translation>
     </message>
@@ -7112,69 +7365,69 @@ O Uemis Zurich está bem ligado?</translation>
         <translation>Última paragem aos 6 m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
         <source>Plan backgas breaks</source>
         <translation>Planear intervalos na mistura de fundo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="355"/>
         <source>Gas options</source>
         <translation>Opções de gás</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="376"/>
         <source>Bottom SAC</source>
         <translation>Consumo no fundo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="383"/>
         <source>Deco SAC</source>
         <translation>Consumo durante a descompressão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="380"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="390"/>
         <source>Bottom pO₂</source>
         <translation>pO₂ no fundo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="403"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="413"/>
         <source>Deco pO₂</source>
         <translation>pO₂ na descompressão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="449"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="462"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="478"/>
         <source>Dive notes</source>
         <translation>Notas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
         <source>Display runtime</source>
         <translation>Mostrar runtime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <source>Display segment duration</source>
         <translation>Mostrar duração dos segmentos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="531"/>
         <source>Display transitions in deco</source>
         <translation>Mostrar transições na descompressão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="538"/>
         <source>Verbatim dive plan</source>
         <translation>Plano de mergulho textual</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="387"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="410"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="397"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -7194,17 +7447,17 @@ O Uemis Zurich está bem ligado?</translation>
         <translation>6 m para a superfície</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="499"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>Mostrar runtime (tempo absoluto) das paragens no plano de mergulho </translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="515"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>Mostrar duração (tempo relativo) das paragens no plano de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>Listar as transições no plano de mergulho ou tratá-las como implícitas</translation>
     </message>
diff --git a/translations/subsurface_ro_RO.ts b/translations/subsurface_ro_RO.ts
index 67b6377f8..e4c088282 100644
--- a/translations/subsurface_ro_RO.ts
+++ b/translations/subsurface_ro_RO.ts
@@ -3,12 +3,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="539"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="522"/>
         <source>Person: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="540"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="523"/>
         <source>Searches for buddies and divemasters</source>
         <translation type="unfinished"/>
     </message>
@@ -16,40 +16,188 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="233"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="230"/>
         <source>No buddies</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>ColumnNameProvider</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>GPS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Avg depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="210"/>
+        <location filename="../configuredivecomputer.cpp" line="212"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="226"/>
+        <location filename="../configuredivecomputer.cpp" line="228"/>
         <source>Could not open backup file: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="542"/>
+        <location filename="../configuredivecomputer.cpp" line="552"/>
         <source>Dive computer details read successfully</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="551"/>
+        <location filename="../configuredivecomputer.cpp" line="561"/>
         <source>Setting successfully written to device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="560"/>
+        <location filename="../configuredivecomputer.cpp" line="570"/>
         <source>Device firmware successfully updated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="569"/>
+        <location filename="../configuredivecomputer.cpp" line="579"/>
         <source>Device settings successfully reset</source>
         <translation type="unfinished"/>
     </message>
@@ -847,70 +995,70 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1053"/>
         <source>Backup files (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1037"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1040"/>
         <source>Backup succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1041"/>
         <source>Your settings have been saved to: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1030"/>
         <source>Backup dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1036"/>
         <source>XML backup error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1052"/>
         <source>Restore dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1056"/>
         <source>XML restore error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1057"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1063"/>
         <source>Restore succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1064"/>
         <source>Your settings have been restored successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1074"/>
         <source>Select firmware file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1075"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -968,12 +1116,12 @@
         <translation>Făcând click aici veți înlătura acest tub.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="410"/>
         <source>Cylinder cannot be removed</source>
         <translation>Tubul nu poate fi înlăturat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="407"/>
+        <location filename="../qt-ui/models.cpp" line="411"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation type="unfinished"/>
     </message>
@@ -1049,12 +1197,12 @@
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="48"/>
         <source>Remove the selected dive computer?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="49"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
         <translation>Sunteți sigur că vreți să înlăturați 
@@ -1069,22 +1217,22 @@ computerul de scufundări selectat?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Model</source>
         <translation>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Device ID</source>
         <translation>ID-ul dispozitivului</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Nickname</source>
         <translation>Alias</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -1092,117 +1240,145 @@ computerul de scufundări selectat?</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="115"/>
         <source>Bailing out to OC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="117"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>început</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>sfârșit</translation>
     </message>
 </context>
 <context>
+    <name>DiveImportedModel</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="556"/>
+        <source>Date/time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
+        <source>Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>h:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>min</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1242"/>
+        <location filename="../qt-ui/models.cpp" line="1248"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1245"/>
+        <location filename="../qt-ui/models.cpp" line="1251"/>
         <source>Date</source>
         <translation>Dată</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1248"/>
+        <location filename="../qt-ui/models.cpp" line="1254"/>
         <source>Rating</source>
         <translation>Rating</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>ft</source>
         <translation>picioare</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1254"/>
+        <location filename="../qt-ui/models.cpp" line="1260"/>
         <source>Duration</source>
         <translation>Durată</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1263"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>lbs</source>
         <translation>livre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1263"/>
+        <location filename="../qt-ui/models.cpp" line="1269"/>
         <source>Suit</source>
         <translation>Costum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1266"/>
+        <location filename="../qt-ui/models.cpp" line="1272"/>
         <source>Cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1269"/>
+        <location filename="../qt-ui/models.cpp" line="1275"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1277"/>
+        <location filename="../qt-ui/models.cpp" line="1283"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1280"/>
+        <location filename="../qt-ui/models.cpp" line="1286"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1283"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>Location</source>
         <translation>Locație</translation>
     </message>
@@ -1210,87 +1386,87 @@ computerul de scufundări selectat?</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="787"/>
+        <location filename="../qt-ui/divelistview.cpp" line="768"/>
         <source>Expand all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="788"/>
+        <location filename="../qt-ui/divelistview.cpp" line="769"/>
         <source>Collapse all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="789"/>
+        <location filename="../qt-ui/divelistview.cpp" line="770"/>
         <source>Collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="791"/>
+        <location filename="../qt-ui/divelistview.cpp" line="772"/>
         <source>Remove dive(s) from trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="792"/>
+        <location filename="../qt-ui/divelistview.cpp" line="773"/>
         <source>Create new trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="806"/>
+        <location filename="../qt-ui/divelistview.cpp" line="787"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="808"/>
+        <location filename="../qt-ui/divelistview.cpp" line="789"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="812"/>
+        <location filename="../qt-ui/divelistview.cpp" line="793"/>
         <source>Merge trip with trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="813"/>
+        <location filename="../qt-ui/divelistview.cpp" line="794"/>
         <source>Merge trip with trip below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="817"/>
+        <location filename="../qt-ui/divelistview.cpp" line="798"/>
         <source>Delete dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="819"/>
+        <location filename="../qt-ui/divelistview.cpp" line="800"/>
         <source>Mark dive(s) invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="823"/>
+        <location filename="../qt-ui/divelistview.cpp" line="804"/>
         <source>Merge selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="825"/>
+        <location filename="../qt-ui/divelistview.cpp" line="806"/>
         <source>Renumber dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="826"/>
+        <location filename="../qt-ui/divelistview.cpp" line="807"/>
         <source>Shift times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="827"/>
+        <location filename="../qt-ui/divelistview.cpp" line="808"/>
         <source>Load images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Open image files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation type="unfinished"/>
     </message>
@@ -1475,100 +1651,100 @@ computerul de scufundări selectat?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>Fișiere UDDF (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="268"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="68"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
         <source>Subsurface native XML format.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
         <source>Write depths of images to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export UDDF file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="267"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
         <source>Export CSV file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="278"/>
         <source>Export world map</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="299"/>
         <source>HTML files (*.html)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="283"/>
         <source>Export Subsurface XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="284"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
         <source>Save image depths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="298"/>
         <source>Export HTML files as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
         <source>Can&apos;t open file %s</source>
         <translation type="unfinished"/>
     </message>
@@ -1581,247 +1757,227 @@ computerul de scufundări selectat?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
-        <source>CSV options</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
+        <source>Time</source>
+        <translation>Timp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="281"/>
-        <source>Pre-configured imports</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="97"/>
+        <source>Metric</source>
+        <translation>Metric</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="122"/>
-        <source>Depth</source>
-        <translation>Adâncime</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="102"/>
+        <source>Imperial</source>
+        <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="142"/>
-        <source>Stopdepth</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="59"/>
+        <source>dd.mm.yyyy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="162"/>
-        <source>Pressure</source>
-        <translation>Presiune</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="176"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="466"/>
-        <source>Time</source>
-        <translation>Timp</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="183"/>
-        <source>Temp</source>
-        <translation>Temp</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="213"/>
-        <source>NDL</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="64"/>
+        <source>mm/dd/yyyy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="233"/>
-        <source>TTS</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="69"/>
+        <source>yyyy-mm-dd</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="253"/>
-        <source>Cns</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
+        <source>Drag the tags above to each corresponding column below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="58"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="789"/>
-        <source>Field separator</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+        <source>Dive #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="35"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="363"/>
-        <source>Units</source>
-        <translation>Unități</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+        <source>Date</source>
+        <translation>Dată</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="42"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="370"/>
-        <source>Metric</source>
-        <translation>Metric</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+        <source>Duration</source>
+        <translation>Durată</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="47"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="375"/>
-        <source>Imperial</source>
-        <translation>Imperial</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+        <source>GPS</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="169"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+        <source>Tags</source>
+        <translation>Etichete</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="298"/>
-        <source>Manual dives</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+        <source>O₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="316"/>
-        <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+        <source>He</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="319"/>
-        <source>Date format</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="78"/>
+        <source>Seconds</source>
+        <translation>Secunde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="332"/>
-        <source>dd.mm.yyyy</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
+        <source>Minutes</source>
+        <translation>Minute</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="337"/>
-        <source>mm/dd/yyyy</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="88"/>
+        <source>Minutes:seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="342"/>
-        <source>yyyy-mm-dd</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+        <source>Location</source>
+        <translation>Locație</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="392"/>
-        <source>Dive #</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+        <source>Max depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="426"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="439"/>
-        <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+        <source>Tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="429"/>
-        <source>Date</source>
-        <translation>Dată</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="500"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="513"/>
-        <source>Dive duration in seconds or in min:sec format</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="503"/>
-        <source>Duration</source>
-        <translation>Durată</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="574"/>
-        <source>GPS</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+        <source>Sample time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="591"/>
-        <source>Tags</source>
-        <translation>Etichete</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="608"/>
-        <source>Cyl size</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+        <source>Sample temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="625"/>
-        <source>Air temp</source>
-        <translation>Temperatura aerului</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="642"/>
-        <source>Start Pressure</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+        <source>Sample cns</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="659"/>
-        <source>Water temp</source>
-        <translation>Temperatura apei</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="676"/>
-        <source>End Press</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+        <source>Sample tts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="693"/>
-        <source>O₂</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+        <source>Sample stopdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="710"/>
-        <source>He</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+        <source>Samples pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="742"/>
-        <source>Choose duration format.</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+        <source>Sample pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="745"/>
-        <source>Duration format</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+        <source>Mean depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="758"/>
-        <source>Seconds</source>
-        <translation>Secunde</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="763"/>
-        <source>Minutes</source>
-        <translation>Minute</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+        <source>Buddy</source>
+        <translation>Companion</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="768"/>
-        <source>Minutes:seconds</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+        <source>Notes</source>
+        <translation>Notițe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="540"/>
-        <source>Location</source>
-        <translation>Locație</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+        <source>Weight</source>
+        <translation>Greutate</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="409"/>
-        <source>Max depth</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+        <source>Cyl. size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="386"/>
-        <source>Field configuration</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+        <source>Start pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="449"/>
-        <source>Mean depth</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+        <source>End pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="483"/>
-        <source>Buddy</source>
-        <translation>Companion</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="523"/>
-        <source>Notes</source>
-        <translation>Notițe</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="557"/>
-        <source>Weight</source>
-        <translation>Greutate</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1865,42 +2021,42 @@ computerul de scufundări selectat?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
         <source>unknown</source>
         <translation>necunoscut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="691"/>
         <source>Final depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="693"/>
         <source>Run time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="701"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="695"/>
         <source>Duration</source>
         <translation>Durată</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="703"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
         <source>Used gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="705"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
         <source>CC set point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1044"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1051"/>
         <source>Discard the plan?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1045"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1052"/>
         <source>You are about to discard your plan.</source>
         <translation>Sunteți pe cale de a șterge planul.</translation>
     </message>
@@ -1908,22 +2064,22 @@ computerul de scufundări selectat?</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="257"/>
         <source>Dive planner points</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="261"/>
         <source>Available gases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="284"/>
         <source>Add dive data point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="304"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="293"/>
         <source>Save new</source>
         <translation type="unfinished"/>
     </message>
@@ -1931,92 +2087,112 @@ computerul de scufundări selectat?</translation>
 <context>
     <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Depth</source>
         <translation>Adâncime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
         <source>Time</source>
         <translation>Timp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
         <source>Pressure</source>
         <translation>Presiune</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>Temperature</source>
         <translation>Temperatură</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
         <source>Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
         <source>Pressure S</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
+        <source>Setpoint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
+        <source>Sensor1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
+        <source>Sensor2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
+        <source>Sensor3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
         <source>Ambient pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
-        <source>Heart Beat</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
+        <source>Heart beat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
-        <source>Gradient Factor</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/>
+        <source>Gradient factor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
-        <source>Mean Depth/s</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
+        <source>Mean depth/s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
         <source>Pressure I</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
         <source>User entered</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
         <source>Cylinder index</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
         <source>Ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
@@ -2067,127 +2243,127 @@ computerul de scufundări selectat?</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1437"/>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1443"/>
+        <location filename="../qt-ui/models.cpp" line="1489"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1440"/>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1492"/>
         <source>Date</source>
         <translation>Dată</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1443"/>
-        <location filename="../qt-ui/models.cpp" line="1489"/>
+        <location filename="../qt-ui/models.cpp" line="1449"/>
+        <location filename="../qt-ui/models.cpp" line="1495"/>
         <source>Rating</source>
         <translation>Rating</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1452"/>
         <source>Depth</source>
         <translation>Adâncime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1458"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1461"/>
         <source>Weight</source>
         <translation>Greutate</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>ft</source>
         <translation>picioare</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1458"/>
-        <location filename="../qt-ui/models.cpp" line="1504"/>
+        <location filename="../qt-ui/models.cpp" line="1464"/>
+        <location filename="../qt-ui/models.cpp" line="1510"/>
         <source>Suit</source>
         <translation>Costum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1461"/>
-        <location filename="../qt-ui/models.cpp" line="1507"/>
+        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1513"/>
         <source>Cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1464"/>
-        <location filename="../qt-ui/models.cpp" line="1510"/>
+        <location filename="../qt-ui/models.cpp" line="1470"/>
+        <location filename="../qt-ui/models.cpp" line="1516"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1473"/>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1527"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
-        <location filename="../qt-ui/models.cpp" line="1524"/>
+        <location filename="../qt-ui/models.cpp" line="1482"/>
+        <location filename="../qt-ui/models.cpp" line="1530"/>
         <source>Location</source>
         <translation>Locație</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1449"/>
-        <location filename="../qt-ui/models.cpp" line="1495"/>
+        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1501"/>
         <source>Duration</source>
         <translation>Durată</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1498"/>
+        <location filename="../qt-ui/models.cpp" line="1504"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>lbs</source>
         <translation>livre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1470"/>
-        <location filename="../qt-ui/models.cpp" line="1518"/>
+        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1524"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -2195,95 +2371,95 @@ computerul de scufundări selectat?</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="98"/>
         <source>no dives were selected</source>
         <translation>nu a fost selectată nicio scufundare</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="117"/>
         <source>failed to create zip file for upload: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="143"/>
         <source>cannot create temporary file: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/>
         <source>internal error: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="169"/>
         <source>internal error</source>
         <translation>eroare internă</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="629"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="828"/>
         <source>Done</source>
         <translation>Finalizat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/>
         <source>Uploading dive list...</source>
         <translation>Se uploadează lista de scufundări...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="692"/>
         <source>Downloading dive list...</source>
         <translation>Se descarcă lista de scufundări...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="741"/>
         <source>Downloading %1 dives...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="785"/>
         <source>Download finished - %1</source>
         <translation>Descărcarea s-a terminat - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="802"/>
         <source>Corrupted download</source>
         <translation>Descărcarea a fost coruptă.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Arhiva nu a putut fi deschisăȘ
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
         <source>Upload failed</source>
         <translation>Upload-ul a eșuat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/>
         <source>Upload successful</source>
         <translation>Upload-ul a avut succes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
         <source>Login failed</source>
         <translation>Logarea a eșuat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
         <source>Cannot parse response</source>
         <translation>Nu s-a putut parsa răspunsul</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
         <source>Error: %1</source>
         <translation>Eroare: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="829"/>
         <source>Upload finished</source>
         <translation>Upload-ul a fost finalizat</translation>
     </message>
@@ -2291,54 +2467,52 @@ computerul de scufundări selectat?</translation>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="169"/>
         <source>Error</source>
         <translation>Eroare</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="400"/>
         <source>Retry</source>
         <translation>Reîncearcă</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="264"/>
         <source>Find Uemis dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Log files (*.log)</source>
         <translation>Fișiere de log (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="362"/>
         <source>Warning</source>
         <translation>Avertizare</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="363"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="374"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Selectați fișierul pentru a salva dump-ul binar al computerului de scufundări</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="375"/>
         <source>Dump files (*.bin)</source>
         <translation>Fișiere dump (*.bin)</translation>
     </message>
@@ -2346,7 +2520,7 @@ computerul de scufundări selectat?</translation>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="101"/>
         <source>Vendor</source>
         <translation>Furnizor</translation>
     </message>
@@ -2356,54 +2530,74 @@ computerul de scufundări selectat?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="31"/>
         <source>Device or mount point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="111"/>
         <source>Dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="132"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="45"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="80"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="94"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="52"/>
         <source>Force download of all dives</source>
         <translation>Forțeaza descărcarea tuturor scufundărilor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
         <source>Always prefer downloaded dives</source>
         <translation>Preferă întotdeauna scufundările descărcate</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="189"/>
         <source>Cancel</source>
         <translation>Anulează</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/>
+        <source>Downloaded Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
+        <source>Select all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
+        <source>Unselect all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
         <source>Save libdivecomputer logfile</source>
         <translation>Salvați fișierul de log al libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="87"/>
         <source>Save libdivecomputer dumpfile</source>
         <translation>Salvați fișierul de dump al libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
         <source>Download into new trip</source>
         <translation type="unfinished"/>
     </message>
@@ -2411,12 +2605,12 @@ computerul de scufundări selectat?</translation>
 <context>
     <name>ExtraDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Value</source>
         <translation type="unfinished"/>
     </message>
@@ -2430,21 +2624,21 @@ computerul de scufundări selectat?</translation>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="245"/>
-        <source>Your dive profile was updated to facebook.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
-        <source>Photo Upload Failed</source>
+        <source>Your dive profile was updated to Facebook.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="250"/>
-        <source>Your dive profile was not updated to facebook, 
+        <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+        <source>Photo Upload Failed</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>FilterWidget</name>
@@ -2485,17 +2679,17 @@ computerul de scufundări selectat?</translation>
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1544"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1621"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1624"/>
         <source>Firmware update failed!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1550"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1627"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -2503,7 +2697,7 @@ computerul de scufundări selectat?</translation>
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="128"/>
+        <location filename="../qt-ui/globe.cpp" line="119"/>
         <source>Edit selected dive locations</source>
         <translation type="unfinished"/>
     </message>
@@ -2511,7 +2705,7 @@ computerul de scufundări selectat?</translation>
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="566"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="549"/>
         <source>Location: </source>
         <translation type="unfinished"/>
     </message>
@@ -2519,7 +2713,7 @@ computerul de scufundări selectat?</translation>
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="286"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="283"/>
         <source>No location set</source>
         <translation type="unfinished"/>
     </message>
@@ -2527,347 +2721,352 @@ computerul de scufundări selectat?</translation>
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="133"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
+        <location filename="../qt-ui/maintab.cpp" line="497"/>
         <source>Location</source>
         <translation>Locație</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="67"/>
         <source>Coordinates</source>
         <translation>Coordonate</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="169"/>
         <source>Divemaster</source>
         <translation>Maestru scufundare</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="154"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Buddy</source>
         <translation>Companion</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="222"/>
+        <location filename="../qt-ui/maintab.ui" line="277"/>
         <source>Tags</source>
         <translation>Etichete</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="186"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
         <source>Rating</source>
         <translation>Rating</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="221"/>
         <source>Visibility</source>
         <translation>Vizibilitate</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="230"/>
         <source>Suit</source>
         <translation>Costum</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="465"/>
+        <location filename="../qt-ui/maintab.cpp" line="470"/>
         <source>Dive notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
-        <location filename="../qt-ui/maintab.ui" line="648"/>
-        <location filename="../qt-ui/maintab.cpp" line="277"/>
+        <location filename="../qt-ui/maintab.ui" line="74"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="102"/>
+        <location filename="../qt-ui/maintab.ui" line="677"/>
+        <location filename="../qt-ui/maintab.cpp" line="279"/>
         <source>Air temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <location filename="../qt-ui/maintab.ui" line="667"/>
-        <location filename="../qt-ui/maintab.cpp" line="278"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.ui" line="696"/>
+        <location filename="../qt-ui/maintab.cpp" line="280"/>
         <source>Water temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="229"/>
-        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.ui" line="284"/>
+        <location filename="../qt-ui/maintab.cpp" line="498"/>
         <source>Notes</source>
         <translation>Notițe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="369"/>
+        <location filename="../qt-ui/maintab.ui" line="398"/>
         <source>Equipment</source>
         <translation>Echipament</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="496"/>
+        <location filename="../qt-ui/maintab.ui" line="525"/>
         <source>Gases used</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="515"/>
+        <location filename="../qt-ui/maintab.ui" line="544"/>
         <source>Gas consumed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="553"/>
+        <location filename="../qt-ui/maintab.ui" line="582"/>
         <source>CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="591"/>
+        <location filename="../qt-ui/maintab.ui" line="620"/>
         <source>Max. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="629"/>
+        <location filename="../qt-ui/maintab.ui" line="658"/>
         <source>Air pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="686"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>Dive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="845"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
         <source>Total time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="903"/>
+        <location filename="../qt-ui/maintab.ui" line="932"/>
         <source>Gas consumption</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="962"/>
+        <location filename="../qt-ui/maintab.ui" line="991"/>
         <source>Extra data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="968"/>
+        <location filename="../qt-ui/maintab.ui" line="997"/>
         <source>Additional data from dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="54"/>
-        <location filename="../qt-ui/maintab.ui" line="458"/>
+        <location filename="../qt-ui/maintab.ui" line="83"/>
+        <location filename="../qt-ui/maintab.ui" line="487"/>
         <source>Date</source>
         <translation>Dată</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="61"/>
+        <location filename="../qt-ui/maintab.ui" line="90"/>
         <source>Time</source>
         <translation>Timp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="425"/>
+        <location filename="../qt-ui/maintab.ui" line="454"/>
         <source>Dive info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="477"/>
+        <location filename="../qt-ui/maintab.ui" line="506"/>
         <source>Interval</source>
         <translation>Interval</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="534"/>
-        <location filename="../qt-ui/maintab.ui" line="799"/>
+        <location filename="../qt-ui/maintab.ui" line="563"/>
+        <location filename="../qt-ui/maintab.ui" line="828"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="610"/>
+        <location filename="../qt-ui/maintab.ui" line="639"/>
         <source>Avg. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="572"/>
+        <location filename="../qt-ui/maintab.ui" line="601"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="734"/>
         <source>Salinity</source>
         <translation>Salinitate</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="742"/>
+        <location filename="../qt-ui/maintab.ui" line="771"/>
         <source>Stats</source>
         <translation>Statistici</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="775"/>
+        <location filename="../qt-ui/maintab.ui" line="804"/>
         <source>Depth</source>
         <translation>Adâncime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="787"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Temperature</source>
         <translation>Temperatură</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="813"/>
+        <location filename="../qt-ui/maintab.ui" line="842"/>
         <source>Duration</source>
         <translation>Durată</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="864"/>
+        <location filename="../qt-ui/maintab.ui" line="893"/>
         <source>Dives</source>
         <translation>Scufundări</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="948"/>
+        <location filename="../qt-ui/maintab.ui" line="977"/>
         <source>Photos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="95"/>
+        <location filename="../qt-ui/maintab.cpp" line="87"/>
         <source>Cylinders</source>
         <translation>Tub</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="99"/>
+        <location filename="../qt-ui/maintab.cpp" line="91"/>
         <source>Weights</source>
         <translation>Greutăți</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="55"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Apply changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="59"/>
+        <location filename="../qt-ui/maintab.cpp" line="50"/>
         <source>Discard changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="96"/>
+        <location filename="../qt-ui/maintab.cpp" line="88"/>
         <source>Add cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="100"/>
+        <location filename="../qt-ui/maintab.cpp" line="92"/>
         <source>Add weight system</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="274"/>
+        <location filename="../qt-ui/maintab.cpp" line="276"/>
         <source>Air temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="275"/>
+        <location filename="../qt-ui/maintab.cpp" line="277"/>
         <source>Water temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="312"/>
+        <location filename="../qt-ui/maintab.cpp" line="314"/>
         <source>This trip is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="320"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Multiple dives are being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.cpp" line="324"/>
         <source>This dive is being edited.</source>
         <translation>Această scufundare este editată</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="436"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
+        <location filename="../qt-ui/maintab.cpp" line="465"/>
         <source>Trip notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="458"/>
+        <location filename="../qt-ui/maintab.cpp" line="463"/>
         <source>Trip location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="526"/>
-        <location filename="../qt-ui/maintab.cpp" line="558"/>
-        <location filename="../qt-ui/maintab.cpp" line="562"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
         <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="574"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="555"/>
+        <location filename="../qt-ui/maintab.cpp" line="563"/>
         <source>Deepest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="556"/>
+        <location filename="../qt-ui/maintab.cpp" line="564"/>
         <source>Shallowest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="569"/>
+        <location filename="../qt-ui/maintab.cpp" line="577"/>
         <source>Highest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="578"/>
         <source>Lowest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="571"/>
+        <location filename="../qt-ui/maintab.cpp" line="579"/>
         <source>Average total SAC of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="582"/>
+        <location filename="../qt-ui/maintab.cpp" line="590"/>
         <source>Highest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="583"/>
+        <location filename="../qt-ui/maintab.cpp" line="591"/>
         <source>Lowest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="584"/>
+        <location filename="../qt-ui/maintab.cpp" line="592"/>
         <source>Average temperature of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="594"/>
+        <location filename="../qt-ui/maintab.cpp" line="602"/>
         <source>Longest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="595"/>
+        <location filename="../qt-ui/maintab.cpp" line="603"/>
         <source>Shortest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="596"/>
+        <location filename="../qt-ui/maintab.cpp" line="604"/>
         <source>Average length of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="620"/>
+        <location filename="../qt-ui/maintab.cpp" line="628"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="624"/>
+        <location filename="../qt-ui/maintab.cpp" line="632"/>
         <source> and </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="911"/>
+        <location filename="../qt-ui/maintab.cpp" line="925"/>
         <source>Discard the changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="912"/>
+        <location filename="../qt-ui/maintab.cpp" line="926"/>
         <source>You are about to discard your changes.</source>
         <translation type="unfinished"/>
     </message>
@@ -3010,7 +3209,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="296"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="232"/>
         <source>Open</source>
         <translation>Deschide</translation>
     </message>
@@ -3370,90 +3569,90 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="252"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="229"/>
         <source>Open file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="256"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="233"/>
         <source>Cancel</source>
         <translation>Anulează</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="332"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="309"/>
         <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="444"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
         <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="491"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
         <source>Print runtime table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="834"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="811"/>
         <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="836"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="813"/>
         <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="841"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="818"/>
         <source>Save changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1196"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1173"/>
         <source>Save file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1337"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1314"/>
         <source>Open dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="819"/>
         <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="300"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="444"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="277"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Warning</source>
         <translation>Avertizare</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1180"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1157"/>
         <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="625"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="602"/>
         <source>Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1197"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1174"/>
         <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="1338"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1315"/>
         <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"/>
     </message>
@@ -3461,7 +3660,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="651"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="634"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation type="unfinished"/>
     </message>
@@ -3469,39 +3668,39 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="239"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="243"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="244"/>
         <source>Not now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="245"/>
         <source>Update firmware</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
         <source>Firmware upgrade notice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
         <source>Save the downloaded firmware as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
         <source>HEX files (*.hex)</source>
         <translation type="unfinished"/>
     </message>
@@ -3509,54 +3708,69 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Open circuit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>ft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="481"/>
         <source>Last stop at 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="482"/>
         <source>50% avg. depth to 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="489"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
         <source>20ft to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="485"/>
         <source>m/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
         <source>Last stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
         <source>50% avg. depth to 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="494"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
         <source>6m to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="497"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="498"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
         <source>cuft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="506"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="507"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="500"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="501"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
@@ -3675,6 +3889,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="816"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -3709,57 +3924,87 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="795"/>
+        <source>CCR: Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="809"/>
+        <source>Default CCR set-point for dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="832"/>
+        <source>pSCR O₂ metabolism rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="839"/>
+        <source>pSCR ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="846"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="859"/>
+        <source>1:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="875"/>
         <source>System default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="843"/>
+        <location filename="../qt-ui/preferences.ui" line="914"/>
         <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="849"/>
+        <location filename="../qt-ui/preferences.ui" line="920"/>
         <source>Proxy type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="862"/>
+        <location filename="../qt-ui/preferences.ui" line="933"/>
         <source>Host</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="888"/>
+        <location filename="../qt-ui/preferences.ui" line="959"/>
         <source>Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="914"/>
+        <location filename="../qt-ui/preferences.ui" line="985"/>
         <source>Requires authentication</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="934"/>
+        <location filename="../qt-ui/preferences.ui" line="1005"/>
         <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="957"/>
+        <location filename="../qt-ui/preferences.ui" line="1028"/>
         <source>Password</source>
         <translation>Parola</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="985"/>
-        <source>about:blank</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="1011"/>
-        <source>Disconnect from facebook</source>
+        <location filename="../qt-ui/preferences.ui" line="1079"/>
+        <source>Disconnect from Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="824"/>
+        <location filename="../qt-ui/preferences.ui" line="895"/>
         <source>Filter</source>
         <translation>Filtrează</translation>
     </message>
@@ -3914,52 +4159,52 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="28"/>
+        <location filename="../qt-ui/preferences.cpp" line="44"/>
         <source>No proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="29"/>
+        <location filename="../qt-ui/preferences.cpp" line="45"/>
         <source>System proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="30"/>
+        <location filename="../qt-ui/preferences.cpp" line="46"/>
         <source>HTTP proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="31"/>
+        <location filename="../qt-ui/preferences.cpp" line="47"/>
         <source>SOCKS proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="291"/>
+        <location filename="../qt-ui/preferences.cpp" line="324"/>
         <source>Restart required</source>
         <translation>Este necesară o repornire</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="292"/>
+        <location filename="../qt-ui/preferences.cpp" line="325"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>Pentru a încărca corect o nouă limbă trebuie să restartați Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="456"/>
+        <location filename="../qt-ui/preferences.cpp" line="494"/>
         <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Fișiere XML Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Open default log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="455"/>
+        <location filename="../qt-ui/preferences.cpp" line="493"/>
         <source>Warning</source>
         <translation>Avertizare</translation>
     </message>
@@ -3967,17 +4212,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="91"/>
+        <location filename="../qt-ui/printdialog.cpp" line="85"/>
         <source>&amp;Preview</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="88"/>
+        <location filename="../qt-ui/printdialog.cpp" line="82"/>
         <source>P&amp;rint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="103"/>
+        <location filename="../qt-ui/printdialog.cpp" line="97"/>
         <source>Print</source>
         <translation>Printează</translation>
     </message>
@@ -3985,42 +4230,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="20"/>
         <source>Dive#</source>
         <translation>Scufundarea nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="21"/>
         <source>Date</source>
         <translation>Dată</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="22"/>
         <source>Depth</source>
         <translation>Adâncime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="23"/>
         <source>Duration</source>
         <translation>Durată</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Master</source>
         <translation>Maestru</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Buddy</source>
         <translation>Companion</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="34"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Location</source>
         <translation>Locația</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <location filename="../qt-ui/printlayout.cpp" line="63"/>
         <source>Subsurface cannot find a usable printer on this system!</source>
         <translation type="unfinished"/>
     </message>
@@ -4086,72 +4331,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2095"/>
+        <location filename="../qt-ui/models.cpp" line="2101"/>
         <source>unknown</source>
         <translation>necunoscut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2100"/>
+        <location filename="../qt-ui/models.cpp" line="2106"/>
         <source>Dive #%1 - %2</source>
         <translation>Scufundarea  #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2103"/>
+        <location filename="../qt-ui/models.cpp" line="2109"/>
         <source>Max depth: %1 %2</source>
         <translation>Adâncimea maximă: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2110"/>
+        <location filename="../qt-ui/models.cpp" line="2116"/>
         <source>Duration: %1 min</source>
         <translation>Durata: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2115"/>
+        <location filename="../qt-ui/models.cpp" line="2121"/>
         <source>Gas used:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2117"/>
+        <location filename="../qt-ui/models.cpp" line="2123"/>
         <source>Tags:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2119"/>
+        <location filename="../qt-ui/models.cpp" line="2125"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2121"/>
+        <location filename="../qt-ui/models.cpp" line="2127"/>
         <source>Weights:</source>
         <translation>GreutățiȘ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2126"/>
+        <location filename="../qt-ui/models.cpp" line="2132"/>
         <source>Notes:</source>
         <translation>Notițe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2133"/>
+        <location filename="../qt-ui/models.cpp" line="2139"/>
         <source>Divemaster:</source>
         <translation>Maestru scufundare:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2135"/>
+        <location filename="../qt-ui/models.cpp" line="2141"/>
         <source>Buddy:</source>
         <translation>Companion:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2137"/>
+        <location filename="../qt-ui/models.cpp" line="2143"/>
         <source>Suit:</source>
         <translation>Costum:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2139"/>
+        <location filename="../qt-ui/models.cpp" line="2145"/>
         <source>Viz:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2141"/>
+        <location filename="../qt-ui/models.cpp" line="2147"/>
         <source>Rating:</source>
         <translation>Rating:</translation>
     </message>
@@ -4159,103 +4404,108 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="628"/>
         <source> (#%1 of %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="630"/>
+        <source>Unknown dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="647"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1168"/>
         <source>Make first divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Delete this divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1184"/>
         <source>Add gas change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1187"/>
         <source> (Tank %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1195"/>
         <source>Add set-point change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1197"/>
         <source>Add bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
         <source>Remove event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1206"/>
         <source>Hide similar events</source>
         <translation>Șterge evenimente similare</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1213"/>
         <source>Edit name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1242"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1249"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1264"/>
         <source>Unhide all events</source>
         <translation>Arată toate evenimentele</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide events</source>
         <translation>Ascunde evenimente</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide all %1 events?</source>
         <translation>Ascunde toate %1 evenimentele?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1333"/>
         <source>Remove the selected event?</source>
         <translation>Înlătură evenimentul selectat?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1334"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1424"/>
         <source>Edit name of bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
         <source>Custom name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1430"/>
         <source>Name is too long!</source>
         <translation type="unfinished"/>
     </message>
@@ -4263,102 +4513,102 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>AIR</source>
         <translation>AER</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>OXYGEN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="208"/>
         <source>Remove this point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="57"/>
         <source>Close</source>
         <translation>Închide</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="42"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="25"/>
         <source>Average</source>
         <translation>Medie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="45"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="28"/>
         <source>Minimum</source>
         <translation>Minim</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="48"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="31"/>
         <source>Maximum</source>
         <translation>Maxim</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="297"/>
+        <location filename="../qt-ui/globe.cpp" line="296"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>Mutați harta si faceți dublu click pentru a seta locația scufundării</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="525"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="526"/>
         <source>lbs</source>
         <translation>livre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="550"/>
         <source>ft</source>
         <translation>picioare</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="551"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="570"/>
+        <location filename="../qt-ui/models.cpp" line="574"/>
         <source>psi</source>
         <translation>livre pe inch pătrat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="571"/>
+        <location filename="../qt-ui/models.cpp" line="575"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="595"/>
+        <location filename="../qt-ui/models.cpp" line="599"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="596"/>
+        <location filename="../qt-ui/models.cpp" line="600"/>
         <source>cuft</source>
         <translation>picioare cubice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="513"/>
         <source>Invalid response from server</source>
         <translation>Răspuns invalid de la server</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation>Tag XML așteptat „DiveDateReader”, dar s-a întâmpinat „%1”</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="567"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation>Tag-ul XML așteptat „DiveDates” nu a fost găsit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation type="unfinished"/>
     </message>
@@ -4366,12 +4616,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1450"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1518"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1442"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -4385,12 +4635,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
-        <location filename="../qt-ui/simplewidgets.cpp" line="151"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="134"/>
         <source>New starting number</source>
         <translation>Nou număr de început</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="149"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="132"/>
         <source>New number</source>
         <translation type="unfinished"/>
     </message>
@@ -4398,12 +4648,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1575"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1653"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1579"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1657"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -4482,12 +4732,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="276"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="259"/>
         <source>Open image file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="278"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="261"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation type="unfinished"/>
     </message>
@@ -4540,7 +4790,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <name>SocialNetworkDialog</name>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="282"/>
-        <source>Dive Date: %1 
+        <source>Dive date: %1 
 </source>
         <translation type="unfinished"/>
     </message>
@@ -4564,7 +4814,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="290"/>
-        <source>Dive Location: %1 
+        <source>Dive location: %1 
 </source>
         <translation type="unfinished"/>
     </message>
@@ -4681,47 +4931,47 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="329"/>
         <source>Webservice</source>
         <translation>Serviciu Web</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="393"/>
         <source>Connecting...</source>
         <translation>Se conectează...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
         <source>Download finished</source>
         <translation>S-a terminat descărcarea</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Download error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="436"/>
         <source>Connection error: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
         <source>Download successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="439"/>
         <source>Invalid user identifier!</source>
         <translation>Identificator de utilizator invalid!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="312"/>
         <source>Enter User ID and click Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="442"/>
         <source>Cannot parse response!</source>
         <translation>Nu se poate parsa răspunsul!</translation>
     </message>
@@ -4729,7 +4979,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="592"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="575"/>
         <source>Suits: </source>
         <translation type="unfinished"/>
     </message>
@@ -4737,7 +4987,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="119"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="116"/>
         <source>No suit set</source>
         <translation type="unfinished"/>
     </message>
@@ -4754,7 +5004,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="513"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="496"/>
         <source>Tags: </source>
         <translation type="unfinished"/>
     </message>
@@ -4762,7 +5012,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="144"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="141"/>
         <source>Empty tags</source>
         <translation type="unfinished"/>
     </message>
@@ -4770,17 +5020,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>Description</source>
         <translation>Descriere</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -4788,7 +5038,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="141"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="131"/>
         <source>Information</source>
         <translation>Informații</translation>
     </message>
@@ -4796,7 +5046,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1090"/>
+        <location filename="../qt-ui/models.cpp" line="1094"/>
         <source> (%1 shown)</source>
         <translation type="unfinished"/>
     </message>
@@ -4804,72 +5054,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="64"/>
         <source>Check for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="66"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="70"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="72"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
         <source>Please check your internet connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="85"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="84"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="88"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="95"/>
         <source>A new version of Subsurface is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="97"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
         <source>Latest version is %1, please check with your OS vendor for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="103"/>
         <source>Newest release version is </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="105"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
         <source>The server returned the following information:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="121"/>
         <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
         <source>Decline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="124"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
         <source>Accept</source>
         <translation>Accepta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="126"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="125"/>
         <source>Automatic check for updates</source>
         <translation type="unfinished"/>
     </message>
@@ -4877,13 +5127,13 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UserManual</name>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="55"/>
+        <location filename="../qt-ui/usermanual.cpp" line="54"/>
         <source>User Manual</source>
         <translation>Manual Utilizator</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="72"/>
-        <location filename="../qt-ui/usermanual.cpp" line="78"/>
+        <location filename="../qt-ui/usermanual.cpp" line="71"/>
+        <location filename="../qt-ui/usermanual.cpp" line="77"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Nu s-a putut găsi manualul pentru Subsurface</translation>
     </message>
@@ -4961,81 +5211,81 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
         <source>
 Operating System: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
         <source>
 CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 Language: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="93"/>
         <source>Should we ask you later?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Don&apos;t ask me again</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Ask later</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
         <source>Submit user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask again?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="17"/>
         <source>Send</source>
         <translation>Trimitere</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="121"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>Please check your internet connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="131"/>
         <source>Survey successfully submitted.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="136"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation type="unfinished"/>
     </message>
@@ -5043,12 +5293,12 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>Description</source>
         <translation>Descriere</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -5096,12 +5346,12 @@ OS CPU Architecture: %1</source>
         <translation>Uploadează</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="247"/>
         <source>Operation timed out</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="268"/>
         <source>Transferring data...</source>
         <translation type="unfinished"/>
     </message>
@@ -5109,17 +5359,17 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Type</source>
         <translation>Tip</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Weight</source>
         <translation>Greutate</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="496"/>
+        <location filename="../qt-ui/models.cpp" line="500"/>
         <source>Clicking here will remove this weight system.</source>
         <translation type="unfinished"/>
     </message>
@@ -5127,19 +5377,19 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1479"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1487"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1497"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1555"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1566"/>
         <source>Failed!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1506"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1576"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1580"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -5147,79 +5397,79 @@ OS CPU Architecture: %1</source>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1841"/>
+        <location filename="../qt-ui/models.cpp" line="1847"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>An
 &gt; Luna / Excursie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1844"/>
+        <location filename="../qt-ui/models.cpp" line="1850"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1847"/>
+        <location filename="../qt-ui/models.cpp" line="1853"/>
         <source>Duration 
  Total</source>
         <translation>Durată
 Totală</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1850"/>
+        <location filename="../qt-ui/models.cpp" line="1856"/>
         <source>
 Average</source>
         <translation>
 Medie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1853"/>
+        <location filename="../qt-ui/models.cpp" line="1859"/>
         <source>
 Shortest</source>
         <translation>
 Cel mai scurt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1856"/>
+        <location filename="../qt-ui/models.cpp" line="1862"/>
         <source>
 Longest</source>
         <translation>
 Cel mai lung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1859"/>
+        <location filename="../qt-ui/models.cpp" line="1865"/>
         <source>Depth (%1)
  Average</source>
         <translation>Adâncime (%1)
 Medie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1862"/>
-        <location filename="../qt-ui/models.cpp" line="1871"/>
-        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>
 Minimum</source>
         <translation>
 Minim</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1865"/>
-        <location filename="../qt-ui/models.cpp" line="1874"/>
-        <location filename="../qt-ui/models.cpp" line="1883"/>
+        <location filename="../qt-ui/models.cpp" line="1871"/>
+        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>
 Maximum</source>
         <translation>
 Maxim</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1874"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Mediu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1883"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -5300,40 +5550,40 @@ Medie</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1508"/>
+        <location filename="../dive.c" line="1530"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) sau (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="464"/>
+        <location filename="../divelist.c" line="467"/>
         <location filename="../equipment.c" line="81"/>
-        <location filename="../planner.c" line="1060"/>
-        <location filename="../planner.c" line="1063"/>
+        <location filename="../planner.c" line="1081"/>
+        <location filename="../planner.c" line="1084"/>
         <source>air</source>
         <translation>aer</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="192"/>
+        <location filename="../equipment.c" line="194"/>
         <source>integrated</source>
         <translation>integrat</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="193"/>
+        <location filename="../equipment.c" line="195"/>
         <source>belt</source>
         <translation>curea</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="194"/>
+        <location filename="../equipment.c" line="196"/>
         <source>ankle</source>
         <translation>gleznă</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="195"/>
+        <location filename="../equipment.c" line="197"/>
         <source>backplate weight</source>
         <translation>greutate placă spate</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="196"/>
+        <location filename="../equipment.c" line="198"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -5341,7 +5591,7 @@ Medie</translation>
         <location filename="../file.c" line="112"/>
         <location filename="../file.c" line="434"/>
         <location filename="../file.c" line="506"/>
-        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="925"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Nu s-a putut citi &apos;%s&apos;</translation>
     </message>
@@ -5398,9 +5648,9 @@ Medie</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../file.c" line="869"/>
-        <location filename="../file.c" line="909"/>
-        <location filename="../file.c" line="1007"/>
+        <location filename="../file.c" line="870"/>
+        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="1016"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>Numărul maxim de coloane suportate la importarea CSV-ului este %d</translation>
     </message>
@@ -5571,27 +5821,27 @@ Medie</translation>
         <translation>numărul evenimentul este invalid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="421"/>
+        <location filename="../libdivecomputer.c" line="419"/>
         <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="427"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Error registering the data</source>
         <translation>Eroare înregistrând datele</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="433"/>
         <source>Error parsing the datetime</source>
         <translation>Eroare parsând data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Dive %d: %s</source>
         <translation>Scufundarea %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="455"/>
+        <location filename="../libdivecomputer.c" line="454"/>
         <source>Error parsing the divetime</source>
         <translation>Eroare parsând data</translation>
     </message>
@@ -5601,156 +5851,156 @@ Medie</translation>
         <translation>Eroare parsând adâncimea maximă</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="482"/>
+        <location filename="../libdivecomputer.c" line="483"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="501"/>
+        <location filename="../libdivecomputer.c" line="503"/>
         <source>Error parsing the gas mix count</source>
         <translation>Eroare parsând valoarea amestecului de gaz</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="513"/>
+        <location filename="../libdivecomputer.c" line="515"/>
         <source>Error obtaining water salinity</source>
         <translation>Eroare obținând salinitatea apei</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="521"/>
+        <location filename="../libdivecomputer.c" line="524"/>
         <source>Error obtaining surface pressure</source>
         <translation>Eroare obținând presiunea la suprafață</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="545"/>
+        <location filename="../libdivecomputer.c" line="549"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="562"/>
+        <location filename="../libdivecomputer.c" line="569"/>
         <source>Error parsing the gas mix</source>
         <translation>Eroare parsând amestecul de gaz</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="569"/>
+        <location filename="../libdivecomputer.c" line="576"/>
         <source>Error parsing the samples</source>
         <translation>Eroare parsând eșantioanele</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="706"/>
+        <location filename="../libdivecomputer.c" line="713"/>
         <source>Event: waiting for user action</source>
         <translation>Eveniment: aștept acțiunea utilizatorului</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="714"/>
+        <location filename="../libdivecomputer.c" line="721"/>
         <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="778"/>
+        <location filename="../libdivecomputer.c" line="785"/>
         <source>Error registering the event handler.</source>
         <translation>Eroare la înregistrarea handlerului de evenimente.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="783"/>
+        <location filename="../libdivecomputer.c" line="790"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Eroare la înregistrarea handlerului de anulare.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="804"/>
+        <location filename="../libdivecomputer.c" line="811"/>
         <source>Dive data import error</source>
         <translation>Eroare la importarea datelor despre scufundare</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="843"/>
+        <location filename="../libdivecomputer.c" line="850"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Nu s-a putut crea contextul libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="850"/>
+        <location filename="../libdivecomputer.c" line="857"/>
         <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="858"/>
+        <location filename="../libdivecomputer.c" line="865"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="506"/>
+        <location filename="../parse-xml.c" line="516"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Valoare procentuală neobișnuită %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1760"/>
+        <location filename="../parse-xml.c" line="1770"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Nu s-a putut parsa „%s”</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1989"/>
-        <location filename="../parse-xml.c" line="2137"/>
+        <location filename="../parse-xml.c" line="1999"/>
+        <location filename="../parse-xml.c" line="2147"/>
         <source>Database query dm4_events failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1996"/>
-        <location filename="../parse-xml.c" line="2144"/>
+        <location filename="../parse-xml.c" line="2006"/>
+        <location filename="../parse-xml.c" line="2154"/>
         <source>Database query dm4_tags failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2318"/>
+        <location filename="../parse-xml.c" line="2328"/>
         <source>Database query shearwater_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2325"/>
+        <location filename="../parse-xml.c" line="2335"/>
         <source>Database query shearwater_changes failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2332"/>
+        <location filename="../parse-xml.c" line="2342"/>
         <source>Database query shearwater_profile_sample failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2451"/>
+        <location filename="../parse-xml.c" line="2461"/>
         <source>Database query cobalt_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2458"/>
+        <location filename="../parse-xml.c" line="2468"/>
         <source>Database query cobalt_buddies failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2465"/>
+        <location filename="../parse-xml.c" line="2475"/>
         <source>Database query cobalt_visibility failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2472"/>
+        <location filename="../parse-xml.c" line="2482"/>
         <source>Database query cobalt_location failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2479"/>
+        <location filename="../parse-xml.c" line="2489"/>
         <source>Database query cobalt_location (site) failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2486"/>
+        <location filename="../parse-xml.c" line="2496"/>
         <source>Database query cobalt_profile_sample failed.
 </source>
         <translation type="unfinished"/>
@@ -5763,17 +6013,17 @@ Medie</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2168"/>
-        <location filename="../parse-xml.c" line="2189"/>
-        <location filename="../parse-xml.c" line="2508"/>
-        <location filename="../parse-xml.c" line="2527"/>
+        <location filename="../parse-xml.c" line="2178"/>
+        <location filename="../parse-xml.c" line="2199"/>
+        <location filename="../parse-xml.c" line="2518"/>
+        <location filename="../parse-xml.c" line="2537"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Query-ul bazei de date a eșuat „%s”.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2848"/>
+        <location filename="../parse-xml.c" line="2909"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Nu s-a putut deschide stylesheet-ul %s</translation>
     </message>
@@ -5783,362 +6033,368 @@ Medie</translation>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="820"/>
+        <location filename="../planner.c" line="841"/>
         <source>Can&apos;t find gas %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="356"/>
+        <location filename="../planner.c" line="363"/>
         <source>Too many gas mixes</source>
         <translation>Prea multe amestecuri de gaz</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="540"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="548"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="544"/>
+        <location filename="../planner.c" line="551"/>
         <source>Subsurface dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="548"/>
+        <location filename="../planner.c" line="555"/>
         <source>depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="558"/>
         <source>runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="554"/>
+        <location filename="../planner.c" line="561"/>
         <source>duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="557"/>
+        <location filename="../planner.c" line="564"/>
         <source>gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="594"/>
+        <location filename="../planner.c" line="601"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="602"/>
+        <location filename="../planner.c" line="609"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="615"/>
+        <location filename="../planner.c" line="622"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="622"/>
+        <location filename="../planner.c" line="629"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="635"/>
+        <location filename="../planner.c" line="642"/>
         <source>%3.0f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="638"/>
-        <location filename="../planner.c" line="642"/>
+        <location filename="../planner.c" line="645"/>
+        <location filename="../planner.c" line="649"/>
         <source>%3dmin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="651"/>
+        <location filename="../planner.c" line="658"/>
         <source>(SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="676"/>
+        <location filename="../planner.c" line="683"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="678"/>
+        <location filename="../planner.c" line="685"/>
         <source>Switch gas to %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="697"/>
+        <location filename="../planner.c" line="704"/>
         <source>CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="699"/>
+        <location filename="../planner.c" line="706"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="710"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="705"/>
+        <location filename="../planner.c" line="712"/>
         <source>Gas consumption:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="535"/>
-        <location filename="../planner.c" line="725"/>
-        <location filename="../planner.c" line="730"/>
-        <location filename="../planner.c" line="753"/>
+        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="732"/>
+        <location filename="../planner.c" line="737"/>
+        <location filename="../planner.c" line="762"/>
+        <location filename="../planner.c" line="772"/>
         <source>Warning:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="523"/>
+        <location filename="../planner.c" line="530"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="726"/>
+        <location filename="../planner.c" line="733"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="731"/>
+        <location filename="../planner.c" line="738"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="733"/>
+        <location filename="../planner.c" line="740"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="735"/>
+        <location filename="../planner.c" line="742"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="759"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="1064"/>
+        <location filename="../planner.c" line="769"/>
+        <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="1085"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1099"/>
+        <location filename="../profile.c" line="1113"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1102"/>
+        <location filename="../profile.c" line="1116"/>
         <source>P: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1106"/>
+        <location filename="../profile.c" line="1120"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1112"/>
+        <location filename="../profile.c" line="1126"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1115"/>
+        <location filename="../profile.c" line="1129"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1117"/>
+        <location filename="../profile.c" line="1131"/>
         <source>CNS: %u%%
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1119"/>
+        <location filename="../profile.c" line="1133"/>
         <source>pO%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1121"/>
+        <location filename="../profile.c" line="1135"/>
         <source>pN%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1123"/>
+        <location filename="../profile.c" line="1137"/>
         <source>pHe: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1140"/>
         <source>MOD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1147"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1137"/>
+        <location filename="../profile.c" line="1151"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1149"/>
+        <location filename="../profile.c" line="1163"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1152"/>
+        <location filename="../profile.c" line="1166"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1157"/>
+        <location filename="../profile.c" line="1171"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1174"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1178"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1166"/>
+        <location filename="../profile.c" line="1180"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1183"/>
         <source>TTS: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1172"/>
+        <location filename="../profile.c" line="1186"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1180"/>
+        <location filename="../profile.c" line="1194"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1196"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1185"/>
+        <location filename="../profile.c" line="1199"/>
         <source>TTS: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1188"/>
+        <location filename="../profile.c" line="1202"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1194"/>
+        <location filename="../profile.c" line="1208"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1214"/>
         <source>heartbeat: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1202"/>
+        <location filename="../profile.c" line="1216"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1205"/>
+        <location filename="../profile.c" line="1219"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1314"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1304"/>
-        <location filename="../profile.c" line="1308"/>
-        <location filename="../profile.c" line="1312"/>
+        <location filename="../profile.c" line="1318"/>
+        <location filename="../profile.c" line="1322"/>
+        <location filename="../profile.c" line="1326"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1316"/>
+        <location filename="../profile.c" line="1330"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1334"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1324"/>
-        <location filename="../profile.c" line="1328"/>
+        <location filename="../profile.c" line="1338"/>
+        <location filename="../profile.c" line="1342"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1335"/>
+        <location filename="../profile.c" line="1349"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -6269,6 +6525,7 @@ EADD: %d%s
     </message>
     <message>
         <location filename="../dive.c" line="30"/>
+        <location filename="../equipment.c" line="85"/>
         <source>oxygen</source>
         <translation type="unfinished"/>
     </message>
@@ -6323,97 +6580,97 @@ EADD: %d%s
         <translation>(nicio scufundare)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sun</source>
         <translation>Duminică</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Mon</source>
         <translation>Luni</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Tue</source>
         <translation>Marți</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Wed</source>
         <translation>Miercuri</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Thu</source>
         <translation>Joi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Fri</source>
         <translation>Vineri</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sat</source>
         <translation>Sâmbătă</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jun</source>
         <translation>Iun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Jul</source>
         <translation>Iul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Oct</source>
         <translation>Oct</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Nov</source>
         <translation>Noi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Dec</source>
         <translation>Dec</translation>
     </message>
@@ -7017,13 +7274,13 @@ Este Uemis Zurich conectat corect?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
         <source>GF low</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>%</source>
         <translation type="unfinished"/>
     </message>
@@ -7033,7 +7290,7 @@ Este Uemis Zurich conectat corect?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="335"/>
         <source>Drop to first depth</source>
         <translation type="unfinished"/>
     </message>
@@ -7043,69 +7300,69 @@ Este Uemis Zurich conectat corect?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
         <source>Plan backgas breaks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="355"/>
         <source>Gas options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="376"/>
         <source>Bottom SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="383"/>
         <source>Deco SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="380"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="390"/>
         <source>Bottom pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="403"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="413"/>
         <source>Deco pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="449"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="462"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="478"/>
         <source>Dive notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
         <source>Display runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <source>Display segment duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="531"/>
         <source>Display transitions in deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="538"/>
         <source>Verbatim dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="387"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="410"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="397"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -7125,17 +7382,17 @@ Este Uemis Zurich conectat corect?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="499"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="515"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts
index c4e429d4f..57654f12a 100644
--- a/translations/subsurface_ru_RU.ts
+++ b/translations/subsurface_ru_RU.ts
@@ -3,12 +3,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="539"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="522"/>
         <source>Person: </source>
         <translation>Люди:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="540"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="523"/>
         <source>Searches for buddies and divemasters</source>
         <translation type="unfinished"/>
     </message>
@@ -16,40 +16,188 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="233"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="230"/>
         <source>No buddies</source>
         <translation>Без напарника</translation>
     </message>
 </context>
 <context>
+    <name>ColumnNameProvider</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>GPS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Avg depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="210"/>
+        <location filename="../configuredivecomputer.cpp" line="212"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="226"/>
+        <location filename="../configuredivecomputer.cpp" line="228"/>
         <source>Could not open backup file: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="542"/>
+        <location filename="../configuredivecomputer.cpp" line="552"/>
         <source>Dive computer details read successfully</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="551"/>
+        <location filename="../configuredivecomputer.cpp" line="561"/>
         <source>Setting successfully written to device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="560"/>
+        <location filename="../configuredivecomputer.cpp" line="570"/>
         <source>Device firmware successfully updated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="569"/>
+        <location filename="../configuredivecomputer.cpp" line="579"/>
         <source>Device settings successfully reset</source>
         <translation type="unfinished"/>
     </message>
@@ -847,70 +995,70 @@
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1053"/>
         <source>Backup files (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1037"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1040"/>
         <source>Backup succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1041"/>
         <source>Your settings have been saved to: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1030"/>
         <source>Backup dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1036"/>
         <source>XML backup error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1052"/>
         <source>Restore dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1056"/>
         <source>XML restore error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1057"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1063"/>
         <source>Restore succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1064"/>
         <source>Your settings have been restored successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1074"/>
         <source>Select firmware file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1075"/>
         <source>All files (*.*)</source>
         <translation>Все файлы (*.*)</translation>
     </message>
@@ -968,12 +1116,12 @@
         <translation>Нажмите здесь чтобы удалить этот баллон.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="410"/>
         <source>Cylinder cannot be removed</source>
         <translation>Баллон не может быть удален</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="407"/>
+        <location filename="../qt-ui/models.cpp" line="411"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Этот газ используется. Можно удалять только те баллоны, которые не используются.</translation>
     </message>
@@ -1049,12 +1197,12 @@
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="48"/>
         <source>Remove the selected dive computer?</source>
         <translation>Удалить компьютер?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="49"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
         <translation>Вы действительно хотите удалить
@@ -1069,22 +1217,22 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Model</source>
         <translation>Модель</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Device ID</source>
         <translation>Идентификатор</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Nickname</source>
         <translation>Название</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Нажмите здесь чтобы удалить этот дайвкомпьютер.</translation>
     </message>
@@ -1092,117 +1240,145 @@
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="115"/>
         <source>Bailing out to OC</source>
         <translation>Переход на Откр. Цикл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="117"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> начало</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> конец</translation>
     </message>
 </context>
 <context>
+    <name>DiveImportedModel</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="556"/>
+        <source>Date/time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
+        <source>Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>h:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>min</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1242"/>
+        <location filename="../qt-ui/models.cpp" line="1248"/>
         <source>#</source>
         <translation>№</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1245"/>
+        <location filename="../qt-ui/models.cpp" line="1251"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1248"/>
+        <location filename="../qt-ui/models.cpp" line="1254"/>
         <source>Rating</source>
         <translation>Оценка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Depth(%1)</source>
         <translation>Глубина(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>m</source>
         <translation>м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>ft</source>
         <translation>фут</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1254"/>
+        <location filename="../qt-ui/models.cpp" line="1260"/>
         <source>Duration</source>
         <translation>Длительность</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1263"/>
         <source>Temp(%1%2)</source>
         <translation>Температура(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>Weight(%1)</source>
         <translation>Вес(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>lbs</source>
         <translation>фунт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1263"/>
+        <location filename="../qt-ui/models.cpp" line="1269"/>
         <source>Suit</source>
         <translation>Костюм</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1266"/>
+        <location filename="../qt-ui/models.cpp" line="1272"/>
         <source>Cyl</source>
         <translation>Баллон</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1269"/>
+        <location filename="../qt-ui/models.cpp" line="1275"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>/min</source>
         <translation>/мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1277"/>
+        <location filename="../qt-ui/models.cpp" line="1283"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1280"/>
+        <location filename="../qt-ui/models.cpp" line="1286"/>
         <source>Max CNS</source>
         <translation>Макс. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1283"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>Location</source>
         <translation>Местонахождение</translation>
     </message>
@@ -1210,87 +1386,87 @@
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="787"/>
+        <location filename="../qt-ui/divelistview.cpp" line="768"/>
         <source>Expand all</source>
         <translation>Развернуть все</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="788"/>
+        <location filename="../qt-ui/divelistview.cpp" line="769"/>
         <source>Collapse all</source>
         <translation>Свернуть все</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="789"/>
+        <location filename="../qt-ui/divelistview.cpp" line="770"/>
         <source>Collapse others</source>
         <translation>Свернуть остальные</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="791"/>
+        <location filename="../qt-ui/divelistview.cpp" line="772"/>
         <source>Remove dive(s) from trip</source>
         <translation>Удалить из поездки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="792"/>
+        <location filename="../qt-ui/divelistview.cpp" line="773"/>
         <source>Create new trip above</source>
         <translation>Создать поездку выше</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="806"/>
+        <location filename="../qt-ui/divelistview.cpp" line="787"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Добавить к поездке сверху</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="808"/>
+        <location filename="../qt-ui/divelistview.cpp" line="789"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Добавить к поездке снизу</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="812"/>
+        <location filename="../qt-ui/divelistview.cpp" line="793"/>
         <source>Merge trip with trip above</source>
         <translation>Объединить с поездкой выше</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="813"/>
+        <location filename="../qt-ui/divelistview.cpp" line="794"/>
         <source>Merge trip with trip below</source>
         <translation>Объединить с поездкой ниже</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="817"/>
+        <location filename="../qt-ui/divelistview.cpp" line="798"/>
         <source>Delete dive(s)</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="819"/>
+        <location filename="../qt-ui/divelistview.cpp" line="800"/>
         <source>Mark dive(s) invalid</source>
         <translation>Пометить как ошибочное(-ые)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="823"/>
+        <location filename="../qt-ui/divelistview.cpp" line="804"/>
         <source>Merge selected dives</source>
         <translation>Объединить выбранные</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="825"/>
+        <location filename="../qt-ui/divelistview.cpp" line="806"/>
         <source>Renumber dive(s)</source>
         <translation>Перенумеровать</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="826"/>
+        <location filename="../qt-ui/divelistview.cpp" line="807"/>
         <source>Shift times</source>
         <translation>Сдвиг времени</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="827"/>
+        <location filename="../qt-ui/divelistview.cpp" line="808"/>
         <source>Load images</source>
         <translation>Загрузить фото</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Open image files</source>
         <translation>Открыть файлы изображений</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Файлы изображений (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -1475,100 +1651,100 @@
         <translation>Песочная</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF файлы (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="268"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>CSV файлы (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="68"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Распространенный формат, используемый для обмена данными между различными дайверскими программами.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Отправить данные погружения на сайт divelogs.de.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>HTML экспорт мест погружений на карте мира.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
         <source>Subsurface native XML format.</source>
         <translation>Собственный XML-формат Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
         <source>Write depths of images to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export UDDF file as</source>
         <translation>Файл для UDDF экспорта</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="267"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
         <source>Export CSV file as</source>
         <translation>Файл для CSV экспорта</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="278"/>
         <source>Export world map</source>
         <translation>Файл для экспорта карты</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="299"/>
         <source>HTML files (*.html)</source>
         <translation>HTML файлы (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="283"/>
         <source>Export Subsurface XML</source>
         <translation>Экспорт Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="284"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML файлы (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
         <source>Save image depths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="298"/>
         <source>Export HTML files as</source>
         <translation>Экспортировать HTML файл как</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
         <source>Can&apos;t open file %s</source>
         <translation>Невозможно открыть файл %s</translation>
     </message>
@@ -1581,248 +1757,228 @@
         <translation>Импорт журнала погружений</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
-        <source>CSV options</source>
-        <translation>Параметры CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="281"/>
-        <source>Pre-configured imports</source>
-        <translation>Шаблоны</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="122"/>
-        <source>Depth</source>
-        <translation>Глубина</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="142"/>
-        <source>Stopdepth</source>
-        <translation>Остановка</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="162"/>
-        <source>Pressure</source>
-        <translation>Давление</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="176"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="466"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
         <source>Time</source>
         <translation>Время</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="183"/>
-        <source>Temp</source>
-        <translation>Темп.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="213"/>
-        <source>NDL</source>
-        <translation>NDL</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="233"/>
-        <source>TTS</source>
-        <translation>TTS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="253"/>
-        <source>Cns</source>
-        <translation>CNS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="58"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="789"/>
-        <source>Field separator</source>
-        <translation>Разделитель</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="35"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="363"/>
-        <source>Units</source>
-        <translation>Единицы</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="42"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="370"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="97"/>
         <source>Metric</source>
         <translation>Метрическая</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="47"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="375"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="102"/>
         <source>Imperial</source>
         <translation>Имперская</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="169"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="298"/>
-        <source>Manual dives</source>
-        <translation>Погружения введённые вручную</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="316"/>
-        <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="319"/>
-        <source>Date format</source>
-        <translation>Формат даты</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="332"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="59"/>
         <source>dd.mm.yyyy</source>
         <translation>dd.mm.yyyy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="337"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="64"/>
         <source>mm/dd/yyyy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="342"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="69"/>
         <source>yyyy-mm-dd</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="392"/>
-        <source>Dive #</source>
-        <translation>№</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="426"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="439"/>
-        <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+        <source>Dive #</source>
+        <translation>№</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="429"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="500"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="513"/>
-        <source>Dive duration in seconds or in min:sec format</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="503"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
         <source>Duration</source>
         <translation>Длительность</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="574"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="591"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
         <source>Tags</source>
         <translation>Метки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="608"/>
-        <source>Cyl size</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+        <source>O₂</source>
+        <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="625"/>
-        <source>Air temp</source>
-        <translation>Темп. воздуха</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+        <source>He</source>
+        <translation>He</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="78"/>
+        <source>Seconds</source>
+        <translation>Секунды</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
+        <source>Minutes</source>
+        <translation>Минуты</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="642"/>
-        <source>Start Pressure</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="88"/>
+        <source>Minutes:seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="659"/>
-        <source>Water temp</source>
-        <translation>Темп. воды</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+        <source>Location</source>
+        <translation>Местонахождение</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+        <source>Max depth</source>
+        <translation>Макс. глубина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="676"/>
-        <source>End Press</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+        <source>Tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="693"/>
-        <source>O₂</source>
-        <translation>O₂</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="710"/>
-        <source>He</source>
-        <translation>He</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="742"/>
-        <source>Choose duration format.</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+        <source>Sample depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="745"/>
-        <source>Duration format</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+        <source>Sample temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="758"/>
-        <source>Seconds</source>
-        <translation>Секунды</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="763"/>
-        <source>Minutes</source>
-        <translation>Минуты</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="768"/>
-        <source>Minutes:seconds</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+        <source>Sample ndl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="540"/>
-        <source>Location</source>
-        <translation>Местонахождение</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="409"/>
-        <source>Max depth</source>
-        <translation>Макс. глубина</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="386"/>
-        <source>Field configuration</source>
-        <translation>Порядок полей</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+        <source>Samples pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
         <source>Mean depth</source>
         <translation>Сред. глубина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="483"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
         <source>Buddy</source>
         <translation>Партнер</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="523"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
         <source>Notes</source>
         <translation>Примечания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="557"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
         <source>Weight</source>
         <translation>Вес</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DivePlanner</name>
@@ -1865,42 +2021,42 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="691"/>
         <source>Final depth</source>
         <translation>Глубина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="693"/>
         <source>Run time</source>
         <translation>Время отсчета</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="701"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="695"/>
         <source>Duration</source>
         <translation>Длительность</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="703"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
         <source>Used gas</source>
         <translation>Исп. газ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="705"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
         <source>CC set point</source>
         <translation>Установка CC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1044"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1051"/>
         <source>Discard the plan?</source>
         <translation>Отменить план?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1045"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1052"/>
         <source>You are about to discard your plan.</source>
         <translation>Вы собираетесь отказаться от плана.</translation>
     </message>
@@ -1908,22 +2064,22 @@
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="257"/>
         <source>Dive planner points</source>
         <translation>Путевые точки плана</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="261"/>
         <source>Available gases</source>
         <translation>Доступные смеси</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="284"/>
         <source>Add dive data point</source>
         <translation>Добавить путевую точку</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="304"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="293"/>
         <source>Save new</source>
         <translation type="unfinished"/>
     </message>
@@ -1931,92 +2087,112 @@
 <context>
     <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Depth</source>
         <translation>Глубина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
         <source>Time</source>
         <translation>Время</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
         <source>Pressure</source>
         <translation>Давление</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>Temperature</source>
         <translation>Температура</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
         <source>Color</source>
         <translation>Цвет</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
         <source>Pressure S</source>
         <translation>Давление S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
+        <source>Setpoint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
+        <source>Sensor1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
+        <source>Sensor2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
+        <source>Sensor3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
         <source>Ambient pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
-        <source>Heart Beat</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
+        <source>Heart beat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
-        <source>Gradient Factor</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/>
+        <source>Gradient factor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
-        <source>Mean Depth/s</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
+        <source>Mean depth/s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
         <source>Pressure I</source>
         <translation>Давление I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
         <source>User entered</source>
         <translation>Пользователь</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
         <source>Cylinder index</source>
         <translation>Индекс баллона</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
         <source>Ceiling</source>
         <translation>Потолок</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
@@ -2067,127 +2243,127 @@
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1437"/>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1443"/>
+        <location filename="../qt-ui/models.cpp" line="1489"/>
         <source>#</source>
         <translation>№</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1440"/>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1492"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1443"/>
-        <location filename="../qt-ui/models.cpp" line="1489"/>
+        <location filename="../qt-ui/models.cpp" line="1449"/>
+        <location filename="../qt-ui/models.cpp" line="1495"/>
         <source>Rating</source>
         <translation>Оценка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1452"/>
         <source>Depth</source>
         <translation>Глубина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1458"/>
         <source>Temp</source>
         <translation>Темп.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1461"/>
         <source>Weight</source>
         <translation>Вес</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>m</source>
         <translation>м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>ft</source>
         <translation>фут</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>Weight(%1)</source>
         <translation>Вес(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1458"/>
-        <location filename="../qt-ui/models.cpp" line="1504"/>
+        <location filename="../qt-ui/models.cpp" line="1464"/>
+        <location filename="../qt-ui/models.cpp" line="1510"/>
         <source>Suit</source>
         <translation>Костюм</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1461"/>
-        <location filename="../qt-ui/models.cpp" line="1507"/>
+        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1513"/>
         <source>Cyl</source>
         <translation>Баллон</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1464"/>
-        <location filename="../qt-ui/models.cpp" line="1510"/>
+        <location filename="../qt-ui/models.cpp" line="1470"/>
+        <location filename="../qt-ui/models.cpp" line="1516"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>/min</source>
         <translation>/мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1473"/>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1527"/>
         <source>Max CNS</source>
         <translation>Макс. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
-        <location filename="../qt-ui/models.cpp" line="1524"/>
+        <location filename="../qt-ui/models.cpp" line="1482"/>
+        <location filename="../qt-ui/models.cpp" line="1530"/>
         <source>Location</source>
         <translation>Местонахождение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>Depth(%1)</source>
         <translation>Глубина(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1449"/>
-        <location filename="../qt-ui/models.cpp" line="1495"/>
+        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1501"/>
         <source>Duration</source>
         <translation>Длительность</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1498"/>
+        <location filename="../qt-ui/models.cpp" line="1504"/>
         <source>Temp(%1%2)</source>
         <translation>Температура(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>lbs</source>
         <translation>фунт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1470"/>
-        <location filename="../qt-ui/models.cpp" line="1518"/>
+        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1524"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -2195,95 +2371,95 @@
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="98"/>
         <source>no dives were selected</source>
         <translation>не выбраны погружения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="117"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>не удалось создать ZIP файл для загрузки: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="143"/>
         <source>cannot create temporary file: %s</source>
         <translation>невозможно создать временный файл: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/>
         <source>internal error: %s</source>
         <translation>внутренняя ошибка: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="169"/>
         <source>internal error</source>
         <translation>внутренняя ошибка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="629"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="828"/>
         <source>Done</source>
         <translation>Готово</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/>
         <source>Uploading dive list...</source>
         <translation>Выгрузка списка погружений...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="692"/>
         <source>Downloading dive list...</source>
         <translation>Загрузка списка погружений...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="741"/>
         <source>Downloading %1 dives...</source>
         <translation>Загрузка %1 погружений...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="785"/>
         <source>Download finished - %1</source>
         <translation>Загрузка завершена - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="802"/>
         <source>Corrupted download</source>
         <translation>Поврежденная загрузка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Невозможно открыть архив:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
         <source>Upload failed</source>
         <translation>Выгрузка не удалась</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/>
         <source>Upload successful</source>
         <translation>Выгрузка завершена</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
         <source>Login failed</source>
         <translation>Ошибка входа</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
         <source>Cannot parse response</source>
         <translation>Ошибка разбора ответа</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
         <source>Error: %1</source>
         <translation>Ошибка: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="829"/>
         <source>Upload finished</source>
         <translation>Выгрузка завершена</translation>
     </message>
@@ -2291,54 +2467,52 @@
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="169"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="400"/>
         <source>Retry</source>
         <translation>Повторить</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="264"/>
         <source>Find Uemis dive computer</source>
         <translation>Найти дайвкомпьютер Uemis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Выберите файл для журнала загрузки из дайв-компьютера</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Log files (*.log)</source>
         <translation>Файлы журналов (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="362"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="363"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>При сохранении дампа, погружения в журнал НЕ загружаются.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="374"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Выберите файл для двоичного дампа из дайв-компьютера</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="375"/>
         <source>Dump files (*.bin)</source>
         <translation>Дамп-файлы (*.bin)</translation>
     </message>
@@ -2346,7 +2520,7 @@
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="101"/>
         <source>Vendor</source>
         <translation>Производитель</translation>
     </message>
@@ -2356,54 +2530,74 @@
         <translation>Загрузка из дайвкомпьютера</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="31"/>
         <source>Device or mount point</source>
         <translation>Устройство или точка монтирования</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="111"/>
         <source>Dive computer</source>
         <translation>Модель</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="132"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="45"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="80"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="94"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="52"/>
         <source>Force download of all dives</source>
         <translation>Принудительная загрузка всех погружений</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
         <source>Always prefer downloaded dives</source>
         <translation>Предпочтение загруженным</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="189"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/>
+        <source>Downloaded Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
+        <source>Select all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
+        <source>Unselect all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
         <source>Save libdivecomputer logfile</source>
         <translation>Сохранить журнал libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="87"/>
         <source>Save libdivecomputer dumpfile</source>
         <translation>Сохранить дамп-файл libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
         <source>Download into new trip</source>
         <translation type="unfinished"/>
     </message>
@@ -2411,12 +2605,12 @@
 <context>
     <name>ExtraDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Value</source>
         <translation type="unfinished"/>
     </message>
@@ -2430,21 +2624,21 @@
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="245"/>
-        <source>Your dive profile was updated to facebook.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
-        <source>Photo Upload Failed</source>
+        <source>Your dive profile was updated to Facebook.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="250"/>
-        <source>Your dive profile was not updated to facebook, 
+        <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+        <source>Photo Upload Failed</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>FilterWidget</name>
@@ -2485,17 +2679,17 @@
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1544"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1621"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1624"/>
         <source>Firmware update failed!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1550"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1627"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -2503,7 +2697,7 @@
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="128"/>
+        <location filename="../qt-ui/globe.cpp" line="119"/>
         <source>Edit selected dive locations</source>
         <translation>Редактировать местоположение выбранных погружений</translation>
     </message>
@@ -2511,7 +2705,7 @@
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="566"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="549"/>
         <source>Location: </source>
         <translation>Места:</translation>
     </message>
@@ -2519,7 +2713,7 @@
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="286"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="283"/>
         <source>No location set</source>
         <translation>Место не указано</translation>
     </message>
@@ -2527,330 +2721,335 @@
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="133"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
+        <location filename="../qt-ui/maintab.cpp" line="497"/>
         <source>Location</source>
         <translation>Местонахождение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="67"/>
         <source>Coordinates</source>
         <translation>Координаты</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="169"/>
         <source>Divemaster</source>
         <translation>Инструктор</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="154"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Buddy</source>
         <translation>Партнер</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="222"/>
+        <location filename="../qt-ui/maintab.ui" line="277"/>
         <source>Tags</source>
         <translation>Метки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="186"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
         <source>Rating</source>
         <translation>Оценка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="221"/>
         <source>Visibility</source>
         <translation>Видимость</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="230"/>
         <source>Suit</source>
         <translation>Костюм</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="465"/>
+        <location filename="../qt-ui/maintab.cpp" line="470"/>
         <source>Dive notes</source>
         <translation>Погружение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
-        <location filename="../qt-ui/maintab.ui" line="648"/>
-        <location filename="../qt-ui/maintab.cpp" line="277"/>
+        <location filename="../qt-ui/maintab.ui" line="74"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="102"/>
+        <location filename="../qt-ui/maintab.ui" line="677"/>
+        <location filename="../qt-ui/maintab.cpp" line="279"/>
         <source>Air temp.</source>
         <translation>Темп. воздуха</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <location filename="../qt-ui/maintab.ui" line="667"/>
-        <location filename="../qt-ui/maintab.cpp" line="278"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.ui" line="696"/>
+        <location filename="../qt-ui/maintab.cpp" line="280"/>
         <source>Water temp.</source>
         <translation>Темп. воды</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="229"/>
-        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.ui" line="284"/>
+        <location filename="../qt-ui/maintab.cpp" line="498"/>
         <source>Notes</source>
         <translation>Примечания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="369"/>
+        <location filename="../qt-ui/maintab.ui" line="398"/>
         <source>Equipment</source>
         <translation>Снаряжение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="496"/>
+        <location filename="../qt-ui/maintab.ui" line="525"/>
         <source>Gases used</source>
         <translation>Исп. газы</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="515"/>
+        <location filename="../qt-ui/maintab.ui" line="544"/>
         <source>Gas consumed</source>
         <translation>Расход газа</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="553"/>
+        <location filename="../qt-ui/maintab.ui" line="582"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="591"/>
+        <location filename="../qt-ui/maintab.ui" line="620"/>
         <source>Max. depth</source>
         <translation>Макс. глубина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="629"/>
+        <location filename="../qt-ui/maintab.ui" line="658"/>
         <source>Air pressure</source>
         <translation>Давл. воздуха</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="686"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>Dive time</source>
         <translation>Время погружения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="845"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
         <source>Total time</source>
         <translation>Общее время</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="903"/>
+        <location filename="../qt-ui/maintab.ui" line="932"/>
         <source>Gas consumption</source>
         <translation>Расход газа</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="962"/>
+        <location filename="../qt-ui/maintab.ui" line="991"/>
         <source>Extra data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="968"/>
+        <location filename="../qt-ui/maintab.ui" line="997"/>
         <source>Additional data from dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="54"/>
-        <location filename="../qt-ui/maintab.ui" line="458"/>
+        <location filename="../qt-ui/maintab.ui" line="83"/>
+        <location filename="../qt-ui/maintab.ui" line="487"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="61"/>
+        <location filename="../qt-ui/maintab.ui" line="90"/>
         <source>Time</source>
         <translation>Время</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="425"/>
+        <location filename="../qt-ui/maintab.ui" line="454"/>
         <source>Dive info</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="477"/>
+        <location filename="../qt-ui/maintab.ui" line="506"/>
         <source>Interval</source>
         <translation>Интервал</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="534"/>
-        <location filename="../qt-ui/maintab.ui" line="799"/>
+        <location filename="../qt-ui/maintab.ui" line="563"/>
+        <location filename="../qt-ui/maintab.ui" line="828"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="610"/>
+        <location filename="../qt-ui/maintab.ui" line="639"/>
         <source>Avg. depth</source>
         <translation>Сред. глубина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="572"/>
+        <location filename="../qt-ui/maintab.ui" line="601"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="734"/>
         <source>Salinity</source>
         <translation>Соленость</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="742"/>
+        <location filename="../qt-ui/maintab.ui" line="771"/>
         <source>Stats</source>
         <translation>Статистика</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="775"/>
+        <location filename="../qt-ui/maintab.ui" line="804"/>
         <source>Depth</source>
         <translation>Глуб.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="787"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Temperature</source>
         <translation>Температура</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="813"/>
+        <location filename="../qt-ui/maintab.ui" line="842"/>
         <source>Duration</source>
         <translation>Длительность</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="864"/>
+        <location filename="../qt-ui/maintab.ui" line="893"/>
         <source>Dives</source>
         <translation>Погружения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="948"/>
+        <location filename="../qt-ui/maintab.ui" line="977"/>
         <source>Photos</source>
         <translation>Фотографии</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="95"/>
+        <location filename="../qt-ui/maintab.cpp" line="87"/>
         <source>Cylinders</source>
         <translation>Баллоны</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="99"/>
+        <location filename="../qt-ui/maintab.cpp" line="91"/>
         <source>Weights</source>
         <translation>Грузы</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="55"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Apply changes</source>
         <translation>Применить изменения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="59"/>
+        <location filename="../qt-ui/maintab.cpp" line="50"/>
         <source>Discard changes</source>
         <translation>Отменить изменения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="96"/>
+        <location filename="../qt-ui/maintab.cpp" line="88"/>
         <source>Add cylinder</source>
         <translation>Добавить баллон</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="100"/>
+        <location filename="../qt-ui/maintab.cpp" line="92"/>
         <source>Add weight system</source>
         <translation>Добавить грузовую систему</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="274"/>
+        <location filename="../qt-ui/maintab.cpp" line="276"/>
         <source>Air temp. [%1]</source>
         <translation>Темп. воздуха [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="275"/>
+        <location filename="../qt-ui/maintab.cpp" line="277"/>
         <source>Water temp. [%1]</source>
         <translation>Темп. воды [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="312"/>
+        <location filename="../qt-ui/maintab.cpp" line="314"/>
         <source>This trip is being edited.</source>
         <translation>Редактирование поездки.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="320"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Multiple dives are being edited.</source>
         <translation>Множественное редактирование.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.cpp" line="324"/>
         <source>This dive is being edited.</source>
         <translation>Редактирование погружения.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="436"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
+        <location filename="../qt-ui/maintab.cpp" line="465"/>
         <source>Trip notes</source>
         <translation>Поездка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="458"/>
+        <location filename="../qt-ui/maintab.cpp" line="463"/>
         <source>Trip location</source>
         <translation>Местоположение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="526"/>
-        <location filename="../qt-ui/maintab.cpp" line="558"/>
-        <location filename="../qt-ui/maintab.cpp" line="562"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
         <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="574"/>
         <source>/min</source>
         <translation>/мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="555"/>
+        <location filename="../qt-ui/maintab.cpp" line="563"/>
         <source>Deepest dive</source>
         <translation>Максимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="556"/>
+        <location filename="../qt-ui/maintab.cpp" line="564"/>
         <source>Shallowest dive</source>
         <translation>Минимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="569"/>
+        <location filename="../qt-ui/maintab.cpp" line="577"/>
         <source>Highest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="578"/>
         <source>Lowest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="571"/>
+        <location filename="../qt-ui/maintab.cpp" line="579"/>
         <source>Average total SAC of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="582"/>
+        <location filename="../qt-ui/maintab.cpp" line="590"/>
         <source>Highest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="583"/>
+        <location filename="../qt-ui/maintab.cpp" line="591"/>
         <source>Lowest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="584"/>
+        <location filename="../qt-ui/maintab.cpp" line="592"/>
         <source>Average temperature of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="594"/>
+        <location filename="../qt-ui/maintab.cpp" line="602"/>
         <source>Longest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="595"/>
+        <location filename="../qt-ui/maintab.cpp" line="603"/>
         <source>Shortest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="596"/>
+        <location filename="../qt-ui/maintab.cpp" line="604"/>
         <source>Average length of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="620"/>
+        <location filename="../qt-ui/maintab.cpp" line="628"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -2859,17 +3058,17 @@ mixed from Air and using:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="624"/>
+        <location filename="../qt-ui/maintab.cpp" line="632"/>
         <source> and </source>
         <translation> и </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="911"/>
+        <location filename="../qt-ui/maintab.cpp" line="925"/>
         <source>Discard the changes?</source>
         <translation>Отменить изменения?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="912"/>
+        <location filename="../qt-ui/maintab.cpp" line="926"/>
         <source>You are about to discard your changes.</source>
         <translation>Вы собираетесь отменить свои изменения.</translation>
     </message>
@@ -3016,7 +3215,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="296"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="232"/>
         <source>Open</source>
         <translation>Открыть</translation>
     </message>
@@ -3376,90 +3575,90 @@ p, li { white-space: pre-wrap; }
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="252"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="229"/>
         <source>Open file</source>
         <translation>Открыть журнал</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="256"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="233"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="332"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="309"/>
         <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="444"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
         <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="491"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
         <source>Print runtime table</source>
         <translation>Печать плана погружения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="834"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="811"/>
         <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="836"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="813"/>
         <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="841"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="818"/>
         <source>Save changes?</source>
         <translation>Сохранить изменения?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1196"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1173"/>
         <source>Save file as</source>
         <translation>Сохранить как</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1337"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1314"/>
         <source>Open dive log file</source>
         <translation>Открыть журнал погружений</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="819"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Изменения будут утеряны, если вы не сохраните их.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="300"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="444"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="277"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1180"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1157"/>
         <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="625"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="602"/>
         <source>Yearly statistics</source>
         <translation>Статистика по годам</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1197"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1174"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1338"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1315"/>
         <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Пожалуйста, для начала закончите текущее редактирование, а потом пробуйте редактировать другой.</translation>
     </message>
@@ -3467,7 +3666,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="651"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="634"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Показано %1 (из %2) погружений</translation>
     </message>
@@ -3475,39 +3674,39 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="239"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="243"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="244"/>
         <source>Not now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="245"/>
         <source>Update firmware</source>
         <translation>Обновить прошивку</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
         <source>Firmware upgrade notice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
         <source>Save the downloaded firmware as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
         <source>HEX files (*.hex)</source>
         <translation type="unfinished"/>
     </message>
@@ -3515,54 +3714,69 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Open circuit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>ft/min</source>
         <translation>фут/мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="481"/>
         <source>Last stop at 20ft</source>
         <translation>Последняя остановка на 20фт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="482"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% ср. глубины - 20фут</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="489"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
         <source>20ft to surface</source>
         <translation>20фут - поверхность</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="485"/>
         <source>m/min</source>
         <translation>м/мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
         <source>Last stop at 6m</source>
         <translation>Последняя остановка на 6м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% ср. глубины - 6м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="494"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
         <source>6m to surface</source>
         <translation>6м - поверхность</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="497"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="498"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
         <source>cuft/min</source>
         <translation>куб.фут/мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="506"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="507"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="500"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="501"/>
         <source>ℓ/min</source>
         <translation>л/мин</translation>
     </message>
@@ -3681,6 +3895,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="816"/>
         <source>bar</source>
         <translation>бар</translation>
     </message>
@@ -3715,57 +3930,87 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="795"/>
+        <source>CCR: Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="809"/>
+        <source>Default CCR set-point for dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="832"/>
+        <source>pSCR O₂ metabolism rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="839"/>
+        <source>pSCR ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="846"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="859"/>
+        <source>1:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="875"/>
         <source>System default</source>
         <translation>Системные настройки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="843"/>
+        <location filename="../qt-ui/preferences.ui" line="914"/>
         <source>Proxy</source>
         <translation>Прокси</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="849"/>
+        <location filename="../qt-ui/preferences.ui" line="920"/>
         <source>Proxy type</source>
         <translation>Тип прокси</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="862"/>
+        <location filename="../qt-ui/preferences.ui" line="933"/>
         <source>Host</source>
         <translation>Хост</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="888"/>
+        <location filename="../qt-ui/preferences.ui" line="959"/>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="914"/>
+        <location filename="../qt-ui/preferences.ui" line="985"/>
         <source>Requires authentication</source>
         <translation>Требуется авторизация</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="934"/>
+        <location filename="../qt-ui/preferences.ui" line="1005"/>
         <source>Username</source>
         <translation>Пользователь</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="957"/>
+        <location filename="../qt-ui/preferences.ui" line="1028"/>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="985"/>
-        <source>about:blank</source>
+        <location filename="../qt-ui/preferences.ui" line="1079"/>
+        <source>Disconnect from Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1011"/>
-        <source>Disconnect from facebook</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="824"/>
+        <location filename="../qt-ui/preferences.ui" line="895"/>
         <source>Filter</source>
         <translation>Фильтр</translation>
     </message>
@@ -3920,52 +4165,52 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="28"/>
+        <location filename="../qt-ui/preferences.cpp" line="44"/>
         <source>No proxy</source>
         <translation>Без прокси</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="29"/>
+        <location filename="../qt-ui/preferences.cpp" line="45"/>
         <source>System proxy</source>
         <translation>Системный прокси</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="30"/>
+        <location filename="../qt-ui/preferences.cpp" line="46"/>
         <source>HTTP proxy</source>
         <translation>HTTP прокси</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="31"/>
+        <location filename="../qt-ui/preferences.cpp" line="47"/>
         <source>SOCKS proxy</source>
         <translation>SOCKS прокси</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="291"/>
+        <location filename="../qt-ui/preferences.cpp" line="324"/>
         <source>Restart required</source>
         <translation>Необходим перезапуск</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="292"/>
+        <location filename="../qt-ui/preferences.cpp" line="325"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>Для смены языка необходимо перезапустить Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="456"/>
+        <location filename="../qt-ui/preferences.cpp" line="494"/>
         <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
         <translation>Если вы нажмете ОК, все настройки Subsurface будут моментально сброшены в значение по умолчанию.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Open default log file</source>
         <translation>Выберите журнал по умолчанию</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="455"/>
+        <location filename="../qt-ui/preferences.cpp" line="493"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
@@ -3973,17 +4218,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="91"/>
+        <location filename="../qt-ui/printdialog.cpp" line="85"/>
         <source>&amp;Preview</source>
         <translation>Просмотр</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="88"/>
+        <location filename="../qt-ui/printdialog.cpp" line="82"/>
         <source>P&amp;rint</source>
         <translation>Печать</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="103"/>
+        <location filename="../qt-ui/printdialog.cpp" line="97"/>
         <source>Print</source>
         <translation>Печать</translation>
     </message>
@@ -3991,42 +4236,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="20"/>
         <source>Dive#</source>
         <translation>Погр#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="21"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="22"/>
         <source>Depth</source>
         <translation>Глуб.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="23"/>
         <source>Duration</source>
         <translation>Длительность</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Master</source>
         <translation>Инструктор</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Buddy</source>
         <translation>Партнер</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="34"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Location</source>
         <translation>Местонахождение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <location filename="../qt-ui/printlayout.cpp" line="63"/>
         <source>Subsurface cannot find a usable printer on this system!</source>
         <translation type="unfinished"/>
     </message>
@@ -4092,72 +4337,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2095"/>
+        <location filename="../qt-ui/models.cpp" line="2101"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2100"/>
+        <location filename="../qt-ui/models.cpp" line="2106"/>
         <source>Dive #%1 - %2</source>
         <translation>Погружение №%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2103"/>
+        <location filename="../qt-ui/models.cpp" line="2109"/>
         <source>Max depth: %1 %2</source>
         <translation>Макс. глубина: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2110"/>
+        <location filename="../qt-ui/models.cpp" line="2116"/>
         <source>Duration: %1 min</source>
         <translation>Длительность: %1 мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2115"/>
+        <location filename="../qt-ui/models.cpp" line="2121"/>
         <source>Gas used:</source>
         <translation>Исп. газы:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2117"/>
+        <location filename="../qt-ui/models.cpp" line="2123"/>
         <source>Tags:</source>
         <translation>Метки:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2119"/>
+        <location filename="../qt-ui/models.cpp" line="2125"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2121"/>
+        <location filename="../qt-ui/models.cpp" line="2127"/>
         <source>Weights:</source>
         <translation>Грузы:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2126"/>
+        <location filename="../qt-ui/models.cpp" line="2132"/>
         <source>Notes:</source>
         <translation>Заметки:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2133"/>
+        <location filename="../qt-ui/models.cpp" line="2139"/>
         <source>Divemaster:</source>
         <translation>Инструктор:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2135"/>
+        <location filename="../qt-ui/models.cpp" line="2141"/>
         <source>Buddy:</source>
         <translation>Напарник:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2137"/>
+        <location filename="../qt-ui/models.cpp" line="2143"/>
         <source>Suit:</source>
         <translation>Костюм:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2139"/>
+        <location filename="../qt-ui/models.cpp" line="2145"/>
         <source>Viz:</source>
         <translation>Видимость:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2141"/>
+        <location filename="../qt-ui/models.cpp" line="2147"/>
         <source>Rating:</source>
         <translation>Рейтинг:</translation>
     </message>
@@ -4165,103 +4410,108 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="628"/>
         <source> (#%1 of %2)</source>
         <translation> (#%1 из %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="630"/>
+        <source>Unknown dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="647"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1168"/>
         <source>Make first divecomputer</source>
         <translation>Сделать первым компьютером</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Delete this divecomputer</source>
         <translation>Удалить этот дайвкомпьютер</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1184"/>
         <source>Add gas change</source>
         <translation>Добавить замену газа</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1187"/>
         <source> (Tank %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1195"/>
         <source>Add set-point change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1197"/>
         <source>Add bookmark</source>
         <translation>Добавить закладку</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
         <source>Remove event</source>
         <translation>Удалить событие</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1206"/>
         <source>Hide similar events</source>
         <translation>Скрыть похожие события</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1213"/>
         <source>Edit name</source>
         <translation>Изменить закладку</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1242"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1249"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1264"/>
         <source>Unhide all events</source>
         <translation>Показать все события</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide events</source>
         <translation>Скрыть событие</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide all %1 events?</source>
         <translation>Спрятать все %1 события?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1333"/>
         <source>Remove the selected event?</source>
         <translation>Удалить выбранное событие?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1334"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1424"/>
         <source>Edit name of bookmark</source>
         <translation>Изменить закладку</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
         <source>Custom name:</source>
         <translation>Название:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1430"/>
         <source>Name is too long!</source>
         <translation>Слишком длинное название!</translation>
     </message>
@@ -4269,102 +4519,102 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>AIR</source>
         <translation>воздух</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>OXYGEN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="208"/>
         <source>Remove this point</source>
         <translation>Удалить эту точку</translation>
     </message>
     <message>
-        <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="57"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="42"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="25"/>
         <source>Average</source>
         <translation>Среднее</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="45"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="28"/>
         <source>Minimum</source>
         <translation>Минимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="48"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="31"/>
         <source>Maximum</source>
         <translation>Максимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="297"/>
+        <location filename="../qt-ui/globe.cpp" line="296"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>Выберите место на карте двойным щелчком мыши.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="525"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="526"/>
         <source>lbs</source>
         <translation>фунт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="550"/>
         <source>ft</source>
         <translation>фут</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="551"/>
         <source>m</source>
         <translation>м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="570"/>
+        <location filename="../qt-ui/models.cpp" line="574"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="571"/>
+        <location filename="../qt-ui/models.cpp" line="575"/>
         <source>bar</source>
         <translation>бар</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="595"/>
+        <location filename="../qt-ui/models.cpp" line="599"/>
         <source>l</source>
         <translation>л</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="596"/>
+        <location filename="../qt-ui/models.cpp" line="600"/>
         <source>cuft</source>
         <translation>куб. фут</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="513"/>
         <source>Invalid response from server</source>
         <translation>Неверный ответ сервера</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation>XML тег &apos;DiveDateReader&apos; не найден, получен &apos;%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="567"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation>XML тег &apos;DiveDates&apos; не найден</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Неверный XML ответ. Строка %1: %2</translation>
     </message>
@@ -4372,12 +4622,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1450"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1518"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1442"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -4391,12 +4641,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
-        <location filename="../qt-ui/simplewidgets.cpp" line="151"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="134"/>
         <source>New starting number</source>
         <translation>Начать нумерацию с</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="149"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="132"/>
         <source>New number</source>
         <translation>Новый номер</translation>
     </message>
@@ -4404,12 +4654,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1575"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1653"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1579"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1657"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -4488,12 +4738,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Какое время и дата отображены на изображении?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="276"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="259"/>
         <source>Open image file</source>
         <translation>Открыть файл с изображением</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="278"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="261"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Файлы изображений (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -4546,7 +4796,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <name>SocialNetworkDialog</name>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="282"/>
-        <source>Dive Date: %1 
+        <source>Dive date: %1 
 </source>
         <translation type="unfinished"/>
     </message>
@@ -4570,7 +4820,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="290"/>
-        <source>Dive Location: %1 
+        <source>Dive location: %1 
 </source>
         <translation type="unfinished"/>
     </message>
@@ -4689,47 +4939,47 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="329"/>
         <source>Webservice</source>
         <translation>Вебсервис</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="393"/>
         <source>Connecting...</source>
         <translation>Соединение...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
         <source>Download finished</source>
         <translation>Загрузка завершена</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Download error: %1</source>
         <translation>Ошибка загрузки: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="436"/>
         <source>Connection error: </source>
         <translation>Ошибка соединения:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
         <source>Download successful</source>
         <translation>Загрузка завершена</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="439"/>
         <source>Invalid user identifier!</source>
         <translation>Неверный идентификатор пользователя!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="312"/>
         <source>Enter User ID and click Download</source>
         <translation>Укажите КЛЮЧ и нажмите Загрузить</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="442"/>
         <source>Cannot parse response!</source>
         <translation>Невозможно разобрать ответ!</translation>
     </message>
@@ -4737,7 +4987,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="592"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="575"/>
         <source>Suits: </source>
         <translation>Костюмы:</translation>
     </message>
@@ -4745,7 +4995,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="119"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="116"/>
         <source>No suit set</source>
         <translation type="unfinished"/>
     </message>
@@ -4762,7 +5012,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="513"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="496"/>
         <source>Tags: </source>
         <translation>Метки:</translation>
     </message>
@@ -4770,7 +5020,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="144"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="141"/>
         <source>Empty tags</source>
         <translation type="unfinished"/>
     </message>
@@ -4778,17 +5028,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>ml</source>
         <translation>мл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>bar</source>
         <translation>бар</translation>
     </message>
@@ -4796,7 +5046,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="141"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="131"/>
         <source>Information</source>
         <translation>Информация</translation>
     </message>
@@ -4804,7 +5054,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1090"/>
+        <location filename="../qt-ui/models.cpp" line="1094"/>
         <source> (%1 shown)</source>
         <translation type="unfinished"/>
     </message>
@@ -4812,72 +5062,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="64"/>
         <source>Check for updates.</source>
         <translation>Проверить обновления.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="66"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Не получилось проверить наличие обновлений.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="70"/>
         <source>The following error occurred:</source>
         <translation>Возникла ошибка:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="72"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
         <source>Please check your internet connection.</source>
         <translation>Проверьте Интернет-соединение.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="85"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="84"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="88"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="95"/>
         <source>A new version of Subsurface is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="97"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
         <source>Latest version is %1, please check with your OS vendor for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="103"/>
         <source>Newest release version is </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="105"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
         <source>The server returned the following information:</source>
         <translation>Сервер вернул следующую информацию:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="121"/>
         <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
         <source>Decline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="124"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
         <source>Accept</source>
         <translation>Принять</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="126"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="125"/>
         <source>Automatic check for updates</source>
         <translation>Автоматическая проверка обновлений</translation>
     </message>
@@ -4885,13 +5135,13 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UserManual</name>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="55"/>
+        <location filename="../qt-ui/usermanual.cpp" line="54"/>
         <source>User Manual</source>
         <translation>Руководство пользователя</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="72"/>
-        <location filename="../qt-ui/usermanual.cpp" line="78"/>
+        <location filename="../qt-ui/usermanual.cpp" line="71"/>
+        <location filename="../qt-ui/usermanual.cpp" line="77"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Руководство не найдено</translation>
     </message>
@@ -4969,85 +5219,85 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
         <source>
 Operating System: %1</source>
         <translation>
 Операционная система: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 Архитектура ЦПУ: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 Language: %1</source>
         <translation>
 Язык: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="93"/>
         <source>Should we ask you later?</source>
         <translation>Предлагать заполнить опросник в будущем?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Don&apos;t ask me again</source>
         <translation>Больше не спрашивать</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Ask later</source>
         <translation>Спросить позже</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
         <source>Submit user survey.</source>
         <translation>Отправить опросник.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask again?</source>
         <translation>Спрашивать снова?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="17"/>
         <source>Send</source>
         <translation>Отправить</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>
 ОС ЦПУ Архитектура: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation>Не удалось отправить опросник.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="121"/>
         <source>The following error occurred:</source>
         <translation>Возникла ошибка:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>Please check your internet connection.</source>
         <translation>Проверьте Интернет-соединение.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="131"/>
         <source>Survey successfully submitted.</source>
         <translation>Опросник успешно отправлен.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="136"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation>Возникла ошибка во время проверки обновения.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -5055,12 +5305,12 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
@@ -5108,12 +5358,12 @@ OS CPU Architecture: %1</source>
         <translation>Выгрузить</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="247"/>
         <source>Operation timed out</source>
         <translation>Таймаут выполнения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="268"/>
         <source>Transferring data...</source>
         <translation type="unfinished"/>
     </message>
@@ -5121,17 +5371,17 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Weight</source>
         <translation>Вес</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="496"/>
+        <location filename="../qt-ui/models.cpp" line="500"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Нажмите здесь чтобы удалить эту грузовую систему.</translation>
     </message>
@@ -5139,19 +5389,19 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1479"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1487"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1497"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1555"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1566"/>
         <source>Failed!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1506"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1576"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1580"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -5159,79 +5409,79 @@ OS CPU Architecture: %1</source>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1841"/>
+        <location filename="../qt-ui/models.cpp" line="1847"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Год 
  &gt; Месяц / Поездка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1844"/>
+        <location filename="../qt-ui/models.cpp" line="1850"/>
         <source>#</source>
         <translation>№</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1847"/>
+        <location filename="../qt-ui/models.cpp" line="1853"/>
         <source>Duration 
  Total</source>
         <translation>Длительность
 Общее</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1850"/>
+        <location filename="../qt-ui/models.cpp" line="1856"/>
         <source>
 Average</source>
         <translation>
 Среднее</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1853"/>
+        <location filename="../qt-ui/models.cpp" line="1859"/>
         <source>
 Shortest</source>
         <translation>
 Кратчайшее</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1856"/>
+        <location filename="../qt-ui/models.cpp" line="1862"/>
         <source>
 Longest</source>
         <translation>
 Самое долгое</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1859"/>
+        <location filename="../qt-ui/models.cpp" line="1865"/>
         <source>Depth (%1)
  Average</source>
         <translation>Глубина (%1)
 Среднее</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1862"/>
-        <location filename="../qt-ui/models.cpp" line="1871"/>
-        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>
 Minimum</source>
         <translation>
 Минимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1865"/>
-        <location filename="../qt-ui/models.cpp" line="1874"/>
-        <location filename="../qt-ui/models.cpp" line="1883"/>
+        <location filename="../qt-ui/models.cpp" line="1871"/>
+        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>
 Maximum</source>
         <translation>
 Максимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1874"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Среднее</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1883"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Темп. (%1)
@@ -5312,40 +5562,40 @@ Maximum</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1508"/>
+        <location filename="../dive.c" line="1530"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) или (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="464"/>
+        <location filename="../divelist.c" line="467"/>
         <location filename="../equipment.c" line="81"/>
-        <location filename="../planner.c" line="1060"/>
-        <location filename="../planner.c" line="1063"/>
+        <location filename="../planner.c" line="1081"/>
+        <location filename="../planner.c" line="1084"/>
         <source>air</source>
         <translation>воздух</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="192"/>
+        <location filename="../equipment.c" line="194"/>
         <source>integrated</source>
         <translation>интегрированный</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="193"/>
+        <location filename="../equipment.c" line="195"/>
         <source>belt</source>
         <translation>пояс</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="194"/>
+        <location filename="../equipment.c" line="196"/>
         <source>ankle</source>
         <translation>груз на ноги</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="195"/>
+        <location filename="../equipment.c" line="197"/>
         <source>backplate weight</source>
         <translation>груз на пластину</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="196"/>
+        <location filename="../equipment.c" line="198"/>
         <source>clip-on</source>
         <translation>карабины</translation>
     </message>
@@ -5353,7 +5603,7 @@ Maximum</source>
         <location filename="../file.c" line="112"/>
         <location filename="../file.c" line="434"/>
         <location filename="../file.c" line="506"/>
-        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="925"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Ошибка чтения &apos;%s&apos;</translation>
     </message>
@@ -5410,9 +5660,9 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../file.c" line="869"/>
-        <location filename="../file.c" line="909"/>
-        <location filename="../file.c" line="1007"/>
+        <location filename="../file.c" line="870"/>
+        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="1016"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>Для импорта CSV максимально допустимое кол-во колонок %d</translation>
     </message>
@@ -5583,27 +5833,27 @@ Maximum</source>
         <translation>неверный номер события</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="421"/>
+        <location filename="../libdivecomputer.c" line="419"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Невозможно создать анализатор для %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="427"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Error registering the data</source>
         <translation>Ошибка регистрации данных</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="433"/>
         <source>Error parsing the datetime</source>
         <translation>Ошибка разбора даты/времени</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Dive %d: %s</source>
         <translation>Погр. №%d - %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="455"/>
+        <location filename="../libdivecomputer.c" line="454"/>
         <source>Error parsing the divetime</source>
         <translation>Ошибка разбора времени погружения</translation>
     </message>
@@ -5613,156 +5863,156 @@ Maximum</source>
         <translation>Ошибка разбора макс. глубины</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="482"/>
+        <location filename="../libdivecomputer.c" line="483"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="501"/>
+        <location filename="../libdivecomputer.c" line="503"/>
         <source>Error parsing the gas mix count</source>
         <translation>Ошибка разбора счетчика смесей</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="513"/>
+        <location filename="../libdivecomputer.c" line="515"/>
         <source>Error obtaining water salinity</source>
         <translation>Ошибка получения солености воды</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="521"/>
+        <location filename="../libdivecomputer.c" line="524"/>
         <source>Error obtaining surface pressure</source>
         <translation>Ошибка получения давления на поверхности</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="545"/>
+        <location filename="../libdivecomputer.c" line="549"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="562"/>
+        <location filename="../libdivecomputer.c" line="569"/>
         <source>Error parsing the gas mix</source>
         <translation>Ошибка разбора смеси</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="569"/>
+        <location filename="../libdivecomputer.c" line="576"/>
         <source>Error parsing the samples</source>
         <translation>Ошибка разбора выборки</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="706"/>
+        <location filename="../libdivecomputer.c" line="713"/>
         <source>Event: waiting for user action</source>
         <translation>Событие: ожидание действия пользователя</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="714"/>
+        <location filename="../libdivecomputer.c" line="721"/>
         <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="778"/>
+        <location filename="../libdivecomputer.c" line="785"/>
         <source>Error registering the event handler.</source>
         <translation>Ошибка регистрации обработчика событий.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="783"/>
+        <location filename="../libdivecomputer.c" line="790"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Ошибка регистрации обработчика завершения.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="804"/>
+        <location filename="../libdivecomputer.c" line="811"/>
         <source>Dive data import error</source>
         <translation>Ошибка импорта данных погружения</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="843"/>
+        <location filename="../libdivecomputer.c" line="850"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Невозможно создать контекст libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="850"/>
+        <location filename="../libdivecomputer.c" line="857"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Невозможно открыть %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="858"/>
+        <location filename="../libdivecomputer.c" line="865"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="506"/>
+        <location filename="../parse-xml.c" line="516"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Странное значение процентов %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1760"/>
+        <location filename="../parse-xml.c" line="1770"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Ошибка разбора &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1989"/>
-        <location filename="../parse-xml.c" line="2137"/>
+        <location filename="../parse-xml.c" line="1999"/>
+        <location filename="../parse-xml.c" line="2147"/>
         <source>Database query dm4_events failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1996"/>
-        <location filename="../parse-xml.c" line="2144"/>
+        <location filename="../parse-xml.c" line="2006"/>
+        <location filename="../parse-xml.c" line="2154"/>
         <source>Database query dm4_tags failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2318"/>
+        <location filename="../parse-xml.c" line="2328"/>
         <source>Database query shearwater_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2325"/>
+        <location filename="../parse-xml.c" line="2335"/>
         <source>Database query shearwater_changes failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2332"/>
+        <location filename="../parse-xml.c" line="2342"/>
         <source>Database query shearwater_profile_sample failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2451"/>
+        <location filename="../parse-xml.c" line="2461"/>
         <source>Database query cobalt_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2458"/>
+        <location filename="../parse-xml.c" line="2468"/>
         <source>Database query cobalt_buddies failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2465"/>
+        <location filename="../parse-xml.c" line="2475"/>
         <source>Database query cobalt_visibility failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2472"/>
+        <location filename="../parse-xml.c" line="2482"/>
         <source>Database query cobalt_location failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2479"/>
+        <location filename="../parse-xml.c" line="2489"/>
         <source>Database query cobalt_location (site) failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2486"/>
+        <location filename="../parse-xml.c" line="2496"/>
         <source>Database query cobalt_profile_sample failed.
 </source>
         <translation type="unfinished"/>
@@ -5775,17 +6025,17 @@ Maximum</source>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2168"/>
-        <location filename="../parse-xml.c" line="2189"/>
-        <location filename="../parse-xml.c" line="2508"/>
-        <location filename="../parse-xml.c" line="2527"/>
+        <location filename="../parse-xml.c" line="2178"/>
+        <location filename="../parse-xml.c" line="2199"/>
+        <location filename="../parse-xml.c" line="2518"/>
+        <location filename="../parse-xml.c" line="2537"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Ошибка запроса к БД &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2848"/>
+        <location filename="../parse-xml.c" line="2909"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Невозможно открыть файл преобразования %s</translation>
     </message>
@@ -5795,161 +6045,167 @@ Maximum</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="820"/>
+        <location filename="../planner.c" line="841"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Невозможно найти газ %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="356"/>
+        <location filename="../planner.c" line="363"/>
         <source>Too many gas mixes</source>
         <translation>Слишком много смесей</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="540"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation>Расчет деко прекращен из-за большой длительности</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="548"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation>на основе GFlow = %d и GFhigh = %d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="544"/>
+        <location filename="../planner.c" line="551"/>
         <source>Subsurface dive plan</source>
         <translation>План погружения Subsurface</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="548"/>
+        <location filename="../planner.c" line="555"/>
         <source>depth</source>
         <translation>глубина</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="558"/>
         <source>runtime</source>
         <translation>отсчет</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="554"/>
+        <location filename="../planner.c" line="561"/>
         <source>duration</source>
         <translation>длительность</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="557"/>
+        <location filename="../planner.c" line="564"/>
         <source>gas</source>
         <translation>смесь</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="594"/>
+        <location filename="../planner.c" line="601"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="602"/>
+        <location filename="../planner.c" line="609"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Переход на %.*f %s за %d:%02d мин - отсчет %d:%02u на %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="615"/>
+        <location filename="../planner.c" line="622"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="622"/>
+        <location filename="../planner.c" line="629"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Остановка на %.*f %s на %d:%02d мин - отсчет %d:%02u на %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="635"/>
+        <location filename="../planner.c" line="642"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="638"/>
-        <location filename="../planner.c" line="642"/>
+        <location filename="../planner.c" line="645"/>
+        <location filename="../planner.c" line="649"/>
         <source>%3dmin</source>
         <translation>%3dмин</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="651"/>
+        <location filename="../planner.c" line="658"/>
         <source>(SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="676"/>
+        <location filename="../planner.c" line="683"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="678"/>
+        <location filename="../planner.c" line="685"/>
         <source>Switch gas to %s</source>
         <translation>Переключение на %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="697"/>
+        <location filename="../planner.c" line="704"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="699"/>
+        <location filename="../planner.c" line="706"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="710"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="705"/>
+        <location filename="../planner.c" line="712"/>
         <source>Gas consumption:</source>
         <translation>Расход газов:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="535"/>
-        <location filename="../planner.c" line="725"/>
-        <location filename="../planner.c" line="730"/>
-        <location filename="../planner.c" line="753"/>
+        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="732"/>
+        <location filename="../planner.c" line="737"/>
+        <location filename="../planner.c" line="762"/>
+        <location filename="../planner.c" line="772"/>
         <source>Warning:</source>
         <translation>Внимание:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="523"/>
+        <location filename="../planner.c" line="530"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="726"/>
+        <location filename="../planner.c" line="733"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>расход выше чем запас газа в указанном баллоне!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="731"/>
+        <location filename="../planner.c" line="738"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>недостаточно газа для резерва при подъеме</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="733"/>
+        <location filename="../planner.c" line="740"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s %s (%.0f%s/%.0f%s в запланированном подъеме)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="735"/>
+        <location filename="../planner.c" line="742"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s в запланированном подъеме) на %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="759"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>высокий pO₂  %.2f в %d:%02u на %s на глубине %.*f %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="1064"/>
+        <location filename="../planner.c" line="769"/>
+        <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="1085"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1099"/>
+        <location filename="../profile.c" line="1113"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -5958,70 +6214,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1102"/>
+        <location filename="../profile.c" line="1116"/>
         <source>P: %d%s
 </source>
         <translation>Д: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1106"/>
+        <location filename="../profile.c" line="1120"/>
         <source>T: %.1f%s
 </source>
         <translation>Т: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1112"/>
+        <location filename="../profile.c" line="1126"/>
         <source>V: %.1f%s
 </source>
         <translation>С: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1115"/>
+        <location filename="../profile.c" line="1129"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/мин
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1117"/>
+        <location filename="../profile.c" line="1131"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1119"/>
+        <location filename="../profile.c" line="1133"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fбар
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1121"/>
+        <location filename="../profile.c" line="1135"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fбар
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1123"/>
+        <location filename="../profile.c" line="1137"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fбар
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1140"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1147"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -6030,7 +6286,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1137"/>
+        <location filename="../profile.c" line="1151"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -6039,148 +6295,148 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1149"/>
+        <location filename="../profile.c" line="1163"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Ост. безопасности: %uмин @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1152"/>
+        <location filename="../profile.c" line="1166"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Ост. безопасности: неизв. время @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1157"/>
+        <location filename="../profile.c" line="1171"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Деко: %uмин @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1174"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Деко: неиз. время @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1178"/>
         <source>In deco
 </source>
         <translation>В деко
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1166"/>
+        <location filename="../profile.c" line="1180"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %uмин
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1183"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %uмин
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1172"/>
+        <location filename="../profile.c" line="1186"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Деко: %uмин @ %.0f%s (вычисл.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1180"/>
+        <location filename="../profile.c" line="1194"/>
         <source>In deco (calc)
 </source>
         <translation>В деко (вычисл.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1196"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %uмин (вычисл.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1185"/>
+        <location filename="../profile.c" line="1199"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %uмин (вычисл.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1188"/>
+        <location filename="../profile.c" line="1202"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Расчетный потолок %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1194"/>
+        <location filename="../profile.c" line="1208"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Ткань %.0fмин: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1214"/>
         <source>heartbeat: %d
 </source>
         <translation>пульс: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1202"/>
+        <location filename="../profile.c" line="1216"/>
         <source>bearing: %d
 </source>
         <translation>азимут: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1205"/>
+        <location filename="../profile.c" line="1219"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1314"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1304"/>
-        <location filename="../profile.c" line="1308"/>
-        <location filename="../profile.c" line="1312"/>
+        <location filename="../profile.c" line="1318"/>
+        <location filename="../profile.c" line="1322"/>
+        <location filename="../profile.c" line="1326"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sГ:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1316"/>
+        <location filename="../profile.c" line="1330"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sГ:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1334"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sС:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1324"/>
-        <location filename="../profile.c" line="1328"/>
+        <location filename="../profile.c" line="1338"/>
+        <location filename="../profile.c" line="1342"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sС:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1335"/>
+        <location filename="../profile.c" line="1349"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sД:%d %s</translation>
     </message>
@@ -6311,6 +6567,7 @@ EADD: %d%s
     </message>
     <message>
         <location filename="../dive.c" line="30"/>
+        <location filename="../equipment.c" line="85"/>
         <source>oxygen</source>
         <translation type="unfinished"/>
     </message>
@@ -6365,97 +6622,97 @@ EADD: %d%s
         <translation>(нет погружений)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sun</source>
         <translation>Вск</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Mon</source>
         <translation>Пнд</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Tue</source>
         <translation>Втр</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Wed</source>
         <translation>Срд</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Thu</source>
         <translation>Чтв</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Fri</source>
         <translation>Птн</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sat</source>
         <translation>Суб</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jan</source>
         <translation>Янв</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Feb</source>
         <translation>Фев</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Mar</source>
         <translation>Мар</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Apr</source>
         <translation>Апр</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>May</source>
         <translation>Май</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jun</source>
         <translation>Июн</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Jul</source>
         <translation>Июл</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Aug</source>
         <translation>Авг</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Sep</source>
         <translation>Снт</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Oct</source>
         <translation>Окт</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Nov</source>
         <translation>Ноя</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Dec</source>
         <translation>Дек</translation>
     </message>
@@ -7059,13 +7316,13 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Планирование</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
         <source>GF low</source>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>%</source>
         <translation>%</translation>
     </message>
@@ -7075,7 +7332,7 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="335"/>
         <source>Drop to first depth</source>
         <translation>Падение к первой глубине</translation>
     </message>
@@ -7085,69 +7342,69 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Последняя остановка на 6м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
         <source>Plan backgas breaks</source>
         <translation>Перерывы на основной газ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="355"/>
         <source>Gas options</source>
         <translation>Газы</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="376"/>
         <source>Bottom SAC</source>
         <translation>SAC на дне</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="383"/>
         <source>Deco SAC</source>
         <translation>SAC на деко</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="380"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="390"/>
         <source>Bottom pO₂</source>
         <translation>pO₂ на дне</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="403"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="413"/>
         <source>Deco pO₂</source>
         <translation>pO₂ на деко</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="449"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="462"/>
         <source>ℓ/min</source>
         <translation>л/мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="478"/>
         <source>Dive notes</source>
         <translation>План погружения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
         <source>Display runtime</source>
         <translation>Показать отсчет</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <source>Display segment duration</source>
         <translation>Показать время сегмента</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="531"/>
         <source>Display transitions in deco</source>
         <translation>Показать переходы в деко</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="538"/>
         <source>Verbatim dive plan</source>
         <translation>Подробный план:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="387"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="410"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="397"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="420"/>
         <source>bar</source>
         <translation>бар</translation>
     </message>
@@ -7167,17 +7424,17 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>6м - поверхность</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="499"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>Показывать время отсчета для остановок (абсолютное время)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="515"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>Показывать длительность остановок (относительное время)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>Показывать переходы в списке или неявно учитывать их</translation>
     </message>
diff --git a/translations/subsurface_sk_SK.ts b/translations/subsurface_sk_SK.ts
index 896040245..7e674be8b 100644
--- a/translations/subsurface_sk_SK.ts
+++ b/translations/subsurface_sk_SK.ts
@@ -3,12 +3,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="539"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="522"/>
         <source>Person: </source>
         <translation>Osoba:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="540"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="523"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Vyhľadávanie partnerov a divemastrov</translation>
     </message>
@@ -16,40 +16,188 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="233"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="230"/>
         <source>No buddies</source>
         <translation>Žiaden partner</translation>
     </message>
 </context>
 <context>
+    <name>ColumnNameProvider</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>GPS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Avg depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="210"/>
+        <location filename="../configuredivecomputer.cpp" line="212"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation>Neviem uložiť zálohu %1. Error Message: %2</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="226"/>
+        <location filename="../configuredivecomputer.cpp" line="228"/>
         <source>Could not open backup file: %1</source>
         <translation>Neviem otvoriť zálohu: </translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="542"/>
+        <location filename="../configuredivecomputer.cpp" line="552"/>
         <source>Dive computer details read successfully</source>
         <translation>Detaily o počítači úspešne načítané</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="551"/>
+        <location filename="../configuredivecomputer.cpp" line="561"/>
         <source>Setting successfully written to device</source>
         <translation>Nastavenie bolo úspešne uložené do zariadenia</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="560"/>
+        <location filename="../configuredivecomputer.cpp" line="570"/>
         <source>Device firmware successfully updated</source>
         <translation>Firmware počítača úspešne aktualizovaný</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="569"/>
+        <location filename="../configuredivecomputer.cpp" line="579"/>
         <source>Device settings successfully reset</source>
         <translation>Základné nastavenie počítača úspešne obnovené</translation>
     </message>
@@ -847,72 +995,72 @@
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1053"/>
         <source>Backup files (*.xml)</source>
         <translation>Záložné súbory (*.xml)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1037"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>Chyba počas ukladania zálohy.
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1040"/>
         <source>Backup succeeded</source>
         <translation>Vytvorenie zálohy úspešné</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1041"/>
         <source>Your settings have been saved to: %1</source>
         <translation>Nastavenie bolo uložené do: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1030"/>
         <source>Backup dive computer settings</source>
         <translation>Nastavenie záložného počítača</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1036"/>
         <source>XML backup error</source>
         <translation>Chyba XML zálohy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1052"/>
         <source>Restore dive computer settings</source>
         <translation>Obnova nastavenia počítača</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1056"/>
         <source>XML restore error</source>
         <translation>Chyba XML obnovy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1057"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>Pri obnove zálohy nastala chyba.
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1063"/>
         <source>Restore succeeded</source>
         <translation>Úspešná obnova</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1064"/>
         <source>Your settings have been restored successfully.</source>
         <translation>Nastavenia boli obnovené úspešne.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1074"/>
         <source>Select firmware file</source>
         <translation>Vyber súbor s firmware</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1075"/>
         <source>All files (*.*)</source>
         <translation>Všetky súbory (*.*)</translation>
     </message>
@@ -970,12 +1118,12 @@
         <translation>Kliknutím sem vymažeš fľašu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="410"/>
         <source>Cylinder cannot be removed</source>
         <translation>Flaša nemôže byť vymazaná</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="407"/>
+        <location filename="../qt-ui/models.cpp" line="411"/>
         <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>
@@ -1051,12 +1199,12 @@
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="48"/>
         <source>Remove the selected dive computer?</source>
         <translation>Zmazať vybraný počítač?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="49"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
         <translation>Si si istý, že chceš zmazať
@@ -1071,22 +1219,22 @@ vybraný počítač?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Model</source>
         <translation>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Device ID</source>
         <translation>ID zariadenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Nickname</source>
         <translation>Voliteľný názov</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Kliknutím sem vymažeš počítač.</translation>
     </message>
@@ -1094,117 +1242,145 @@ vybraný počítač?</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="115"/>
         <source>Bailing out to OC</source>
         <translation>Záchrana na OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="117"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>začiatok</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>koniec</translation>
     </message>
 </context>
 <context>
+    <name>DiveImportedModel</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="556"/>
+        <source>Date/time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
+        <source>Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>h:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>min</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1242"/>
+        <location filename="../qt-ui/models.cpp" line="1248"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1245"/>
+        <location filename="../qt-ui/models.cpp" line="1251"/>
         <source>Date</source>
         <translation>Dátum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1248"/>
+        <location filename="../qt-ui/models.cpp" line="1254"/>
         <source>Rating</source>
         <translation>Hodnotenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Depth(%1)</source>
         <translation>Hĺbka(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1254"/>
+        <location filename="../qt-ui/models.cpp" line="1260"/>
         <source>Duration</source>
         <translation>Dĺžka (min)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1263"/>
         <source>Temp(%1%2)</source>
         <translation>Tepl(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>Weight(%1)</source>
         <translation>Záťaž(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>lbs</source>
         <translation>US libra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1263"/>
+        <location filename="../qt-ui/models.cpp" line="1269"/>
         <source>Suit</source>
         <translation>Oblek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1266"/>
+        <location filename="../qt-ui/models.cpp" line="1272"/>
         <source>Cyl</source>
         <translation>Fľaša</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1269"/>
+        <location filename="../qt-ui/models.cpp" line="1275"/>
         <source>Gas</source>
         <translation>Zmes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1277"/>
+        <location filename="../qt-ui/models.cpp" line="1283"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1280"/>
+        <location filename="../qt-ui/models.cpp" line="1286"/>
         <source>Max CNS</source>
         <translation>Max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1283"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>Location</source>
         <translation>Miesto</translation>
     </message>
@@ -1212,87 +1388,87 @@ vybraný počítač?</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="787"/>
+        <location filename="../qt-ui/divelistview.cpp" line="768"/>
         <source>Expand all</source>
         <translation>Expandovať všetky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="788"/>
+        <location filename="../qt-ui/divelistview.cpp" line="769"/>
         <source>Collapse all</source>
         <translation>Zredukovať všetky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="789"/>
+        <location filename="../qt-ui/divelistview.cpp" line="770"/>
         <source>Collapse others</source>
         <translation>Zbaliť ostatné</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="791"/>
+        <location filename="../qt-ui/divelistview.cpp" line="772"/>
         <source>Remove dive(s) from trip</source>
         <translation>Vymazať ponor(y) z akcie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="792"/>
+        <location filename="../qt-ui/divelistview.cpp" line="773"/>
         <source>Create new trip above</source>
         <translation>Vytvoriť novú akciu nad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="806"/>
+        <location filename="../qt-ui/divelistview.cpp" line="787"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Pridať ponor(y) do akcie hneď nad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="808"/>
+        <location filename="../qt-ui/divelistview.cpp" line="789"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Pridať ponor(y) do akcie hneď pod</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="812"/>
+        <location filename="../qt-ui/divelistview.cpp" line="793"/>
         <source>Merge trip with trip above</source>
         <translation>Spoj akciu s akciou nad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="813"/>
+        <location filename="../qt-ui/divelistview.cpp" line="794"/>
         <source>Merge trip with trip below</source>
         <translation>Spoj akciu s akciou pod</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="817"/>
+        <location filename="../qt-ui/divelistview.cpp" line="798"/>
         <source>Delete dive(s)</source>
         <translation>Zmazať ponor(y)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="819"/>
+        <location filename="../qt-ui/divelistview.cpp" line="800"/>
         <source>Mark dive(s) invalid</source>
         <translation>Neplatný ponor(y)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="823"/>
+        <location filename="../qt-ui/divelistview.cpp" line="804"/>
         <source>Merge selected dives</source>
         <translation>Spojiť vybraté ponory</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="825"/>
+        <location filename="../qt-ui/divelistview.cpp" line="806"/>
         <source>Renumber dive(s)</source>
         <translation>Prečíslovanie ponorov</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="826"/>
+        <location filename="../qt-ui/divelistview.cpp" line="807"/>
         <source>Shift times</source>
         <translation>Posun času</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="827"/>
+        <location filename="../qt-ui/divelistview.cpp" line="808"/>
         <source>Load images</source>
         <translation>Nahrať obrázky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Open image files</source>
         <translation>Otvoriť súbory s obrázkami</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Grafické súbory (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -1477,100 +1653,100 @@ vybraný počítač?</translation>
         <translation>Piesok</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF súbory (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="268"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>CSV súbory (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="68"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Všeobecný formát používaný pre výmenu dát medzi rôznymi potápačskými programami.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Odoslať dáta o ponore na stránku divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>Odoslať dáta o ponore na stránku dive-share.appspot.com</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>HTML export potápačskej lokality zobrazenej na mape sveta.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurface XML formát.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
         <source>Write depths of images to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export UDDF file as</source>
         <translation>Exportovať UDDF súbor ako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="267"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
         <source>Export CSV file as</source>
         <translation>Exportovať CSV súbor ako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="278"/>
         <source>Export world map</source>
         <translation>Exportovať mapu sveta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="299"/>
         <source>HTML files (*.html)</source>
         <translation>HTML súbory (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="283"/>
         <source>Export Subsurface XML</source>
         <translation>Exportovať </translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="284"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML súbory (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
         <source>Save image depths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="298"/>
         <source>Export HTML files as</source>
         <translation>Exportovať HTML súbor ako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
         <source>Can&apos;t open file %s</source>
         <translation>Neviem otvoriť súbor</translation>
     </message>
@@ -1583,248 +1759,228 @@ vybraný počítač?</translation>
         <translation>Import log súboru</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
-        <source>CSV options</source>
-        <translation>CSV možnosti</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="281"/>
-        <source>Pre-configured imports</source>
-        <translation>Predkonfigurovaný import</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="122"/>
-        <source>Depth</source>
-        <translation>Hĺbka</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="142"/>
-        <source>Stopdepth</source>
-        <translation>Deco stop</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="162"/>
-        <source>Pressure</source>
-        <translation>Tlak</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="176"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="466"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
         <source>Time</source>
         <translation>Čas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="183"/>
-        <source>Temp</source>
-        <translation>Teplota</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="213"/>
-        <source>NDL</source>
-        <translation>NDL</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="233"/>
-        <source>TTS</source>
-        <translation>TTS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="253"/>
-        <source>Cns</source>
-        <translation>Cns</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="58"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="789"/>
-        <source>Field separator</source>
-        <translation>Oddeľovač položiek</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="35"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="363"/>
-        <source>Units</source>
-        <translation>Jednotky</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="42"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="370"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="97"/>
         <source>Metric</source>
         <translation>Metrický</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="47"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="375"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="102"/>
         <source>Imperial</source>
         <translation>Imperiálny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="169"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="298"/>
-        <source>Manual dives</source>
-        <translation>Ručné ponory</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="316"/>
-        <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source>
-        <translation>Zvoľ postupnosť dňa, mesiaca a roku pre formát dátumu. Oddeľovník môže byť jeden z .-/.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="319"/>
-        <source>Date format</source>
-        <translation>Formát dátumu</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="332"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="59"/>
         <source>dd.mm.yyyy</source>
         <translation>dd.mm.rrrr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="337"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="64"/>
         <source>mm/dd/yyyy</source>
         <translation>mm/dd/rrrr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="342"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="69"/>
         <source>yyyy-mm-dd</source>
         <translation>rrrr-mm-dd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="392"/>
-        <source>Dive #</source>
-        <translation>Ponor #</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="426"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="439"/>
-        <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source>
-        <translation>Dátum v dd.mm.rrrr, rrrr-mm-dd alebo mm/dd/rrrr formáte</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+        <source>Dive #</source>
+        <translation>Ponor #</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="429"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
         <source>Date</source>
         <translation>Dátum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="500"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="513"/>
-        <source>Dive duration in seconds or in min:sec format</source>
-        <translation>Trvanie ponoru v sekundovom alebo min:sec formáte</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="503"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
         <source>Duration</source>
         <translation>Dĺžka (min)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="574"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="591"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
         <source>Tags</source>
         <translation>Značky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="608"/>
-        <source>Cyl size</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+        <source>O₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="625"/>
-        <source>Air temp</source>
-        <translation>Teplota vzduchu</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+        <source>He</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="642"/>
-        <source>Start Pressure</source>
-        <translation>Počiatočný tlak</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="78"/>
+        <source>Seconds</source>
+        <translation>Sekundy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="659"/>
-        <source>Water temp</source>
-        <translation>Teplota vody</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
+        <source>Minutes</source>
+        <translation>Minuty</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="676"/>
-        <source>End Press</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="88"/>
+        <source>Minutes:seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="693"/>
-        <source>O₂</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+        <source>Location</source>
+        <translation>Miesto</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+        <source>Max depth</source>
+        <translation>Max. hlbka</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+        <source>Tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="710"/>
-        <source>He</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="742"/>
-        <source>Choose duration format.</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+        <source>Sample time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="745"/>
-        <source>Duration format</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+        <source>Sample depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="758"/>
-        <source>Seconds</source>
-        <translation>Sekundy</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="763"/>
-        <source>Minutes</source>
-        <translation>Minuty</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="768"/>
-        <source>Minutes:seconds</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+        <source>Sample cns</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="540"/>
-        <source>Location</source>
-        <translation>Miesto</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="409"/>
-        <source>Max depth</source>
-        <translation>Max. hlbka</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="386"/>
-        <source>Field configuration</source>
-        <translation>Configurácia položiek</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+        <source>Samples pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
         <source>Mean depth</source>
         <translation>Stredná hlbka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="483"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="523"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
         <source>Notes</source>
         <translation>Poznámky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="557"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
         <source>Weight</source>
         <translation>Hmotnosť</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DivePlanner</name>
@@ -1867,42 +2023,42 @@ vybraný počítač?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
         <source>unknown</source>
         <translation>neznámy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="691"/>
         <source>Final depth</source>
         <translation>Cieľová hĺbka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="693"/>
         <source>Run time</source>
         <translation>Aktuálny čas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="701"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="695"/>
         <source>Duration</source>
         <translation>Dĺžka (min)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="703"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
         <source>Used gas</source>
         <translation>Použitá zmes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="705"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
         <source>CC set point</source>
         <translation>CC SetPoint</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1044"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1051"/>
         <source>Discard the plan?</source>
         <translation>Vymazať plán?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1045"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1052"/>
         <source>You are about to discard your plan.</source>
         <translation>Chystáš sa vymazať svoj plán.</translation>
     </message>
@@ -1910,22 +2066,22 @@ vybraný počítač?</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="257"/>
         <source>Dive planner points</source>
         <translation>Body plánu ponoru</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="261"/>
         <source>Available gases</source>
         <translation>Zmesi k dispozícii</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="284"/>
         <source>Add dive data point</source>
         <translation>Pridať data point ponoru</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="304"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="293"/>
         <source>Save new</source>
         <translation>Uložiť nový</translation>
     </message>
@@ -1933,92 +2089,112 @@ vybraný počítač?</translation>
 <context>
     <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Depth</source>
         <translation>Hĺbka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
         <source>Time</source>
         <translation>Čas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
         <source>Pressure</source>
         <translation>Tlak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>Temperature</source>
         <translation>Teplota</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
         <source>Color</source>
         <translation>Farba</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
         <source>Pressure S</source>
         <translation>Tlak S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
+        <source>Setpoint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
+        <source>Sensor1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
+        <source>Sensor2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
+        <source>Sensor3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
         <source>Ambient pressure</source>
         <translation>Okolitý tlak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
-        <source>Heart Beat</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
+        <source>Heart beat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
-        <source>Gradient Factor</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/>
+        <source>Gradient factor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
-        <source>Mean Depth/s</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
+        <source>Mean depth/s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
         <source>Pressure I</source>
         <translation>Tlak I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
         <source>User entered</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
         <source>Cylinder index</source>
         <translation>Index fliaš</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
         <source>Ceiling</source>
         <translation>Strop</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
         <source>SAC</source>
         <translation>Spotreba plynu</translation>
     </message>
@@ -2069,127 +2245,127 @@ vybraný počítač?</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1437"/>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1443"/>
+        <location filename="../qt-ui/models.cpp" line="1489"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1440"/>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1492"/>
         <source>Date</source>
         <translation>Dátum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1443"/>
-        <location filename="../qt-ui/models.cpp" line="1489"/>
+        <location filename="../qt-ui/models.cpp" line="1449"/>
+        <location filename="../qt-ui/models.cpp" line="1495"/>
         <source>Rating</source>
         <translation>Hodnotenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1452"/>
         <source>Depth</source>
         <translation>Hĺbka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1458"/>
         <source>Temp</source>
         <translation>Teplota</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1461"/>
         <source>Weight</source>
         <translation>Hmotnosť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>SAC</source>
         <translation>Spotreba plynu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>Weight(%1)</source>
         <translation>Záťaž(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1458"/>
-        <location filename="../qt-ui/models.cpp" line="1504"/>
+        <location filename="../qt-ui/models.cpp" line="1464"/>
+        <location filename="../qt-ui/models.cpp" line="1510"/>
         <source>Suit</source>
         <translation>Oblek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1461"/>
-        <location filename="../qt-ui/models.cpp" line="1507"/>
+        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1513"/>
         <source>Cyl</source>
         <translation>Fľaša</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1464"/>
-        <location filename="../qt-ui/models.cpp" line="1510"/>
+        <location filename="../qt-ui/models.cpp" line="1470"/>
+        <location filename="../qt-ui/models.cpp" line="1516"/>
         <source>Gas</source>
         <translation>Zmes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1473"/>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1527"/>
         <source>Max CNS</source>
         <translation>Max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
-        <location filename="../qt-ui/models.cpp" line="1524"/>
+        <location filename="../qt-ui/models.cpp" line="1482"/>
+        <location filename="../qt-ui/models.cpp" line="1530"/>
         <source>Location</source>
         <translation>Miesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>Depth(%1)</source>
         <translation>Hĺbka(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1449"/>
-        <location filename="../qt-ui/models.cpp" line="1495"/>
+        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1501"/>
         <source>Duration</source>
         <translation>Dĺžka (min)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1498"/>
+        <location filename="../qt-ui/models.cpp" line="1504"/>
         <source>Temp(%1%2)</source>
         <translation>Tepl(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>lbs</source>
         <translation>US libra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1470"/>
-        <location filename="../qt-ui/models.cpp" line="1518"/>
+        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1524"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -2197,95 +2373,95 @@ vybraný počítač?</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="98"/>
         <source>no dives were selected</source>
         <translation>neboli vybrané žiadne ponory</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="117"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>vytvorenie zip súboru pre upload zlyhalo: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="143"/>
         <source>cannot create temporary file: %s</source>
         <translation>zlyhalo vytvorenie dočasného súboru: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/>
         <source>internal error: %s</source>
         <translation>interná chyba: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="169"/>
         <source>internal error</source>
         <translation>interná chyba</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="629"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="828"/>
         <source>Done</source>
         <translation>Hotovo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/>
         <source>Uploading dive list...</source>
         <translation>Nahrávanie zoznamu ponorov...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="692"/>
         <source>Downloading dive list...</source>
         <translation>Sťahovanie zoznamu ponorov...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="741"/>
         <source>Downloading %1 dives...</source>
         <translation>Sťahovanie %1 ponorov...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="785"/>
         <source>Download finished - %1</source>
         <translation>Sťahovanie ukončené</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="802"/>
         <source>Corrupted download</source>
         <translation>Poškodené sťahovanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Nemôžem otvoriť archív:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
         <source>Upload failed</source>
         <translation>Nahrávanie zlýhalo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/>
         <source>Upload successful</source>
         <translation>Úspešne nahrávanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
         <source>Login failed</source>
         <translation>Prihlásenie zlýhalo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
         <source>Cannot parse response</source>
         <translation>Neviem spracovať odpoveď</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
         <source>Error: %1</source>
         <translation>Chyba:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="829"/>
         <source>Upload finished</source>
         <translation>Nahrávanie ukončené</translation>
     </message>
@@ -2293,54 +2469,52 @@ vybraný počítač?</translation>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="169"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="400"/>
         <source>Retry</source>
         <translation>Skús znovu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="264"/>
         <source>Find Uemis dive computer</source>
         <translation>Hladať Uemis DC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Zvoľ meno log súboru pre divecomputer sťahovanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Log files (*.log)</source>
         <translation>Log súbory</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="362"/>
         <source>Warning</source>
         <translation>Upozornenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="363"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>Uloženie dump súboru pre libdivecomputer spôsobí nenahratie ponorov do zoznamu ponorov.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="374"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Zvoľ meno súboru pre divecomputer dump</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="375"/>
         <source>Dump files (*.bin)</source>
         <translation>Dump súbory</translation>
     </message>
@@ -2348,7 +2522,7 @@ vybraný počítač?</translation>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="101"/>
         <source>Vendor</source>
         <translation>Výrobca</translation>
     </message>
@@ -2358,54 +2532,74 @@ vybraný počítač?</translation>
         <translation>Nahratie údajov z počítača</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="31"/>
         <source>Device or mount point</source>
         <translation>Zariadenie alebo bod pripojenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="111"/>
         <source>Dive computer</source>
         <translation>Počítač</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="132"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="45"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="80"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="94"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="52"/>
         <source>Force download of all dives</source>
         <translation>Vynútiť načítanie všetkých ponorov</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
         <source>Always prefer downloaded dives</source>
         <translation>Vždy preferuj nahraté ponory</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="189"/>
         <source>Cancel</source>
         <translation>Zrušiť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/>
+        <source>Downloaded Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
+        <source>Select all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
+        <source>Unselect all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
         <source>Save libdivecomputer logfile</source>
         <translation>Uložiť libdivecomputer logfile</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="87"/>
         <source>Save libdivecomputer dumpfile</source>
         <translation>Uložiť </translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
         <source>Download into new trip</source>
         <translation>Nahratie do novej akcie</translation>
     </message>
@@ -2413,12 +2607,12 @@ vybraný počítač?</translation>
 <context>
     <name>ExtraDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Key</source>
         <translation>Kľúč</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Value</source>
         <translation>Hodnota</translation>
     </message>
@@ -2432,21 +2626,21 @@ vybraný počítač?</translation>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="245"/>
-        <source>Your dive profile was updated to facebook.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
-        <source>Photo Upload Failed</source>
+        <source>Your dive profile was updated to Facebook.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="250"/>
-        <source>Your dive profile was not updated to facebook, 
+        <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+        <source>Photo Upload Failed</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>FilterWidget</name>
@@ -2487,17 +2681,17 @@ vybraný počítač?</translation>
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1544"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1621"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Daná funkcia pre zvolený počítač zatiaľ nie je k dispozícii.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1624"/>
         <source>Firmware update failed!</source>
         <translation>Obnova firmware zlyhala!</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1550"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1627"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Nie je možné vytvoriť spojenie s počítačom.</translation>
     </message>
@@ -2505,7 +2699,7 @@ vybraný počítač?</translation>
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="128"/>
+        <location filename="../qt-ui/globe.cpp" line="119"/>
         <source>Edit selected dive locations</source>
         <translation>Edituj označené potápašské lokality</translation>
     </message>
@@ -2513,7 +2707,7 @@ vybraný počítač?</translation>
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="566"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="549"/>
         <source>Location: </source>
         <translation>Miesto:</translation>
     </message>
@@ -2521,7 +2715,7 @@ vybraný počítač?</translation>
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="286"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="283"/>
         <source>No location set</source>
         <translation type="unfinished"/>
     </message>
@@ -2529,330 +2723,335 @@ vybraný počítač?</translation>
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="133"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
+        <location filename="../qt-ui/maintab.cpp" line="497"/>
         <source>Location</source>
         <translation>Miesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="67"/>
         <source>Coordinates</source>
         <translation>Súradnice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="169"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="154"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="222"/>
+        <location filename="../qt-ui/maintab.ui" line="277"/>
         <source>Tags</source>
         <translation>Značky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="186"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
         <source>Rating</source>
         <translation>Hodnotenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="221"/>
         <source>Visibility</source>
         <translation>Viditeľnosť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="230"/>
         <source>Suit</source>
         <translation>Oblek</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="465"/>
+        <location filename="../qt-ui/maintab.cpp" line="470"/>
         <source>Dive notes</source>
         <translation>Poznámky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
-        <location filename="../qt-ui/maintab.ui" line="648"/>
-        <location filename="../qt-ui/maintab.cpp" line="277"/>
+        <location filename="../qt-ui/maintab.ui" line="74"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="102"/>
+        <location filename="../qt-ui/maintab.ui" line="677"/>
+        <location filename="../qt-ui/maintab.cpp" line="279"/>
         <source>Air temp.</source>
         <translation>Teplota vzduchu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <location filename="../qt-ui/maintab.ui" line="667"/>
-        <location filename="../qt-ui/maintab.cpp" line="278"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.ui" line="696"/>
+        <location filename="../qt-ui/maintab.cpp" line="280"/>
         <source>Water temp.</source>
         <translation>Teplota vody</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="229"/>
-        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.ui" line="284"/>
+        <location filename="../qt-ui/maintab.cpp" line="498"/>
         <source>Notes</source>
         <translation>Poznámky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="369"/>
+        <location filename="../qt-ui/maintab.ui" line="398"/>
         <source>Equipment</source>
         <translation>Výstroj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="496"/>
+        <location filename="../qt-ui/maintab.ui" line="525"/>
         <source>Gases used</source>
         <translation>Použité zmesi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="515"/>
+        <location filename="../qt-ui/maintab.ui" line="544"/>
         <source>Gas consumed</source>
         <translation>Spotrebovaná zmes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="553"/>
+        <location filename="../qt-ui/maintab.ui" line="582"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="591"/>
+        <location filename="../qt-ui/maintab.ui" line="620"/>
         <source>Max. depth</source>
         <translation>Max. hĺbka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="629"/>
+        <location filename="../qt-ui/maintab.ui" line="658"/>
         <source>Air pressure</source>
         <translation>Tlak vzduchu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="686"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>Dive time</source>
         <translation>Čas ponoru</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="845"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
         <source>Total time</source>
         <translation>Celkový čas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="903"/>
+        <location filename="../qt-ui/maintab.ui" line="932"/>
         <source>Gas consumption</source>
         <translation>Spotreba plynu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="962"/>
+        <location filename="../qt-ui/maintab.ui" line="991"/>
         <source>Extra data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="968"/>
+        <location filename="../qt-ui/maintab.ui" line="997"/>
         <source>Additional data from dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="54"/>
-        <location filename="../qt-ui/maintab.ui" line="458"/>
+        <location filename="../qt-ui/maintab.ui" line="83"/>
+        <location filename="../qt-ui/maintab.ui" line="487"/>
         <source>Date</source>
         <translation>Dátum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="61"/>
+        <location filename="../qt-ui/maintab.ui" line="90"/>
         <source>Time</source>
         <translation>Čas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="425"/>
+        <location filename="../qt-ui/maintab.ui" line="454"/>
         <source>Dive info</source>
         <translation>Informácie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="477"/>
+        <location filename="../qt-ui/maintab.ui" line="506"/>
         <source>Interval</source>
         <translation>Povrch. interval</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="534"/>
-        <location filename="../qt-ui/maintab.ui" line="799"/>
+        <location filename="../qt-ui/maintab.ui" line="563"/>
+        <location filename="../qt-ui/maintab.ui" line="828"/>
         <source>SAC</source>
         <translation>Spotreba plynu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="610"/>
+        <location filename="../qt-ui/maintab.ui" line="639"/>
         <source>Avg. depth</source>
         <translation>Priemerná hĺbka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="572"/>
+        <location filename="../qt-ui/maintab.ui" line="601"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="734"/>
         <source>Salinity</source>
         <translation>Slanosť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="742"/>
+        <location filename="../qt-ui/maintab.ui" line="771"/>
         <source>Stats</source>
         <translation>Štatistiky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="775"/>
+        <location filename="../qt-ui/maintab.ui" line="804"/>
         <source>Depth</source>
         <translation>Hĺbka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="787"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Temperature</source>
         <translation>Teplota</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="813"/>
+        <location filename="../qt-ui/maintab.ui" line="842"/>
         <source>Duration</source>
         <translation>Dĺžka (min)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="864"/>
+        <location filename="../qt-ui/maintab.ui" line="893"/>
         <source>Dives</source>
         <translation>Ponory</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="948"/>
+        <location filename="../qt-ui/maintab.ui" line="977"/>
         <source>Photos</source>
         <translation>Fotografie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="95"/>
+        <location filename="../qt-ui/maintab.cpp" line="87"/>
         <source>Cylinders</source>
         <translation>Fľaše</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="99"/>
+        <location filename="../qt-ui/maintab.cpp" line="91"/>
         <source>Weights</source>
         <translation>Závažia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="55"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Apply changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="59"/>
+        <location filename="../qt-ui/maintab.cpp" line="50"/>
         <source>Discard changes</source>
         <translation>Vymazať zmeny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="96"/>
+        <location filename="../qt-ui/maintab.cpp" line="88"/>
         <source>Add cylinder</source>
         <translation>Pridaj fľašu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="100"/>
+        <location filename="../qt-ui/maintab.cpp" line="92"/>
         <source>Add weight system</source>
         <translation>Pridať závažia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="274"/>
+        <location filename="../qt-ui/maintab.cpp" line="276"/>
         <source>Air temp. [%1]</source>
         <translation>Teplota vzduchu [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="275"/>
+        <location filename="../qt-ui/maintab.cpp" line="277"/>
         <source>Water temp. [%1]</source>
         <translation>Teplota vody [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="312"/>
+        <location filename="../qt-ui/maintab.cpp" line="314"/>
         <source>This trip is being edited.</source>
         <translation>Táto akcia je editovaná.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="320"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Multiple dives are being edited.</source>
         <translation>Viaceré ponory sú editované.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.cpp" line="324"/>
         <source>This dive is being edited.</source>
         <translation>Tento ponor sa edituje.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="436"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
+        <location filename="../qt-ui/maintab.cpp" line="465"/>
         <source>Trip notes</source>
         <translation>Poznámky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="458"/>
+        <location filename="../qt-ui/maintab.cpp" line="463"/>
         <source>Trip location</source>
         <translation>Lokalita</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="526"/>
-        <location filename="../qt-ui/maintab.cpp" line="558"/>
-        <location filename="../qt-ui/maintab.cpp" line="562"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
         <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="574"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="555"/>
+        <location filename="../qt-ui/maintab.cpp" line="563"/>
         <source>Deepest dive</source>
         <translation>Najhlbší ponor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="556"/>
+        <location filename="../qt-ui/maintab.cpp" line="564"/>
         <source>Shallowest dive</source>
         <translation>Najplytší ponor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="569"/>
+        <location filename="../qt-ui/maintab.cpp" line="577"/>
         <source>Highest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="578"/>
         <source>Lowest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="571"/>
+        <location filename="../qt-ui/maintab.cpp" line="579"/>
         <source>Average total SAC of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="582"/>
+        <location filename="../qt-ui/maintab.cpp" line="590"/>
         <source>Highest temperature</source>
         <translation>Najvyššia teplota</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="583"/>
+        <location filename="../qt-ui/maintab.cpp" line="591"/>
         <source>Lowest temperature</source>
         <translation>Najnižšia teplota</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="584"/>
+        <location filename="../qt-ui/maintab.cpp" line="592"/>
         <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="594"/>
+        <location filename="../qt-ui/maintab.cpp" line="602"/>
         <source>Longest dive</source>
         <translation>Najdlhší ponor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="595"/>
+        <location filename="../qt-ui/maintab.cpp" line="603"/>
         <source>Shortest dive</source>
         <translation>Najkratší ponor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="596"/>
+        <location filename="../qt-ui/maintab.cpp" line="604"/>
         <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="620"/>
+        <location filename="../qt-ui/maintab.cpp" line="628"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -2861,17 +3060,17 @@ vytvorene zo vzduchu a:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="624"/>
+        <location filename="../qt-ui/maintab.cpp" line="632"/>
         <source> and </source>
         <translation>a</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="911"/>
+        <location filename="../qt-ui/maintab.cpp" line="925"/>
         <source>Discard the changes?</source>
         <translation>Vymazať zmeny?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="912"/>
+        <location filename="../qt-ui/maintab.cpp" line="926"/>
         <source>You are about to discard your changes.</source>
         <translation>Chystáš sa vymazať zmeny.</translation>
     </message>
@@ -3018,7 +3217,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="296"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="232"/>
         <source>Open</source>
         <translation>Otvor</translation>
     </message>
@@ -3378,90 +3577,90 @@ p, li { white-space: pre-wrap; }
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="252"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="229"/>
         <source>Open file</source>
         <translation>Otvoriť súbor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="256"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="233"/>
         <source>Cancel</source>
         <translation>Zrušiť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="332"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="309"/>
         <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="444"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
         <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="491"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
         <source>Print runtime table</source>
         <translation>Vytlačiť runtime tabuľku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="834"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="811"/>
         <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="836"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="813"/>
         <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="841"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="818"/>
         <source>Save changes?</source>
         <translation>Uložiť zmeny?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1196"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1173"/>
         <source>Save file as</source>
         <translation>Uložiť súbor ako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1337"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1314"/>
         <source>Open dive log file</source>
         <translation>Otvoriť log súbor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="819"/>
         <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="300"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="444"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="277"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Warning</source>
         <translation>Upozornenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1180"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1157"/>
         <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="625"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="602"/>
         <source>Yearly statistics</source>
         <translation>Ročná štatistika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1197"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1174"/>
         <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="1338"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1315"/>
         <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <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>
@@ -3469,7 +3668,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="651"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="634"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Filter zobrazuje %1 (z %2) ponorov</translation>
     </message>
@@ -3477,39 +3676,39 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="239"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="243"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="244"/>
         <source>Not now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="245"/>
         <source>Update firmware</source>
         <translation>Firmware update</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
         <source>Firmware upgrade notice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
         <source>Save the downloaded firmware as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
         <source>HEX files (*.hex)</source>
         <translation type="unfinished"/>
     </message>
@@ -3517,54 +3716,69 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Open circuit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="481"/>
         <source>Last stop at 20ft</source>
         <translation>Posledná zastávka v 20 stopách</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="482"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% priemernej hĺbky do 20ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="489"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
         <source>20ft to surface</source>
         <translation>20ft na hladinu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="485"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
         <source>Last stop at 6m</source>
         <translation>Posledná zastávka v 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% priemernej hĺbky do 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="494"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
         <source>6m to surface</source>
         <translation>6m na povrch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="497"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="498"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
         <source>cuft/min</source>
         <translation>cuft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="506"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="507"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="500"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="501"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
@@ -3683,6 +3897,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="816"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -3717,57 +3932,87 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="795"/>
+        <source>CCR: Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="809"/>
+        <source>Default CCR set-point for dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="832"/>
+        <source>pSCR O₂ metabolism rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="839"/>
+        <source>pSCR ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="846"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="859"/>
+        <source>1:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="875"/>
         <source>System default</source>
         <translation>Systémove prednastavenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="843"/>
+        <location filename="../qt-ui/preferences.ui" line="914"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="849"/>
+        <location filename="../qt-ui/preferences.ui" line="920"/>
         <source>Proxy type</source>
         <translation>Typ proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="862"/>
+        <location filename="../qt-ui/preferences.ui" line="933"/>
         <source>Host</source>
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="888"/>
+        <location filename="../qt-ui/preferences.ui" line="959"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="914"/>
+        <location filename="../qt-ui/preferences.ui" line="985"/>
         <source>Requires authentication</source>
         <translation>Vyžaduje autentifikáciu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="934"/>
+        <location filename="../qt-ui/preferences.ui" line="1005"/>
         <source>Username</source>
         <translation>Meno</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="957"/>
+        <location filename="../qt-ui/preferences.ui" line="1028"/>
         <source>Password</source>
         <translation>Heslo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="985"/>
-        <source>about:blank</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="1011"/>
-        <source>Disconnect from facebook</source>
+        <location filename="../qt-ui/preferences.ui" line="1079"/>
+        <source>Disconnect from Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="824"/>
+        <location filename="../qt-ui/preferences.ui" line="895"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
@@ -3922,52 +4167,52 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="28"/>
+        <location filename="../qt-ui/preferences.cpp" line="44"/>
         <source>No proxy</source>
         <translation>Žiadne proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="29"/>
+        <location filename="../qt-ui/preferences.cpp" line="45"/>
         <source>System proxy</source>
         <translation>Systémové proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="30"/>
+        <location filename="../qt-ui/preferences.cpp" line="46"/>
         <source>HTTP proxy</source>
         <translation>HTTP proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="31"/>
+        <location filename="../qt-ui/preferences.cpp" line="47"/>
         <source>SOCKS proxy</source>
         <translation>SOCKS proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="291"/>
+        <location filename="../qt-ui/preferences.cpp" line="324"/>
         <source>Restart required</source>
         <translation>Potrebný reštart</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="292"/>
+        <location filename="../qt-ui/preferences.cpp" line="325"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>Na korektné nahratie nového jazyka je potrebné reštartovať Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="456"/>
+        <location filename="../qt-ui/preferences.cpp" line="494"/>
         <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
         <translation>Po stlačení OK budú všetky Subsurface nastavenia zmenené na pôvodné hodnoty. Zmena nastane okamžite.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML súbory (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Open default log file</source>
         <translation>Otvoriť predvolený Log súbor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="455"/>
+        <location filename="../qt-ui/preferences.cpp" line="493"/>
         <source>Warning</source>
         <translation>Upozornenie</translation>
     </message>
@@ -3975,17 +4220,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="91"/>
+        <location filename="../qt-ui/printdialog.cpp" line="85"/>
         <source>&amp;Preview</source>
         <translation>&amp;Náhľad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="88"/>
+        <location filename="../qt-ui/printdialog.cpp" line="82"/>
         <source>P&amp;rint</source>
         <translation>T&amp;lač</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="103"/>
+        <location filename="../qt-ui/printdialog.cpp" line="97"/>
         <source>Print</source>
         <translation>Tlačiť</translation>
     </message>
@@ -3993,42 +4238,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="20"/>
         <source>Dive#</source>
         <translation>Ponor č.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="21"/>
         <source>Date</source>
         <translation>Dátum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="22"/>
         <source>Depth</source>
         <translation>Hĺbka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="23"/>
         <source>Duration</source>
         <translation>Dĺžka (min)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Master</source>
         <translation>Master</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="34"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Location</source>
         <translation>Miesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <location filename="../qt-ui/printlayout.cpp" line="63"/>
         <source>Subsurface cannot find a usable printer on this system!</source>
         <translation>Subsurface nedokáže nájsť použiteľnú tlačiareň na tomto systéme!</translation>
     </message>
@@ -4094,72 +4339,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2095"/>
+        <location filename="../qt-ui/models.cpp" line="2101"/>
         <source>unknown</source>
         <translation>neznámy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2100"/>
+        <location filename="../qt-ui/models.cpp" line="2106"/>
         <source>Dive #%1 - %2</source>
         <translation>Ponor #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2103"/>
+        <location filename="../qt-ui/models.cpp" line="2109"/>
         <source>Max depth: %1 %2</source>
         <translation>Max hĺbka: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2110"/>
+        <location filename="../qt-ui/models.cpp" line="2116"/>
         <source>Duration: %1 min</source>
         <translation>Trvanie: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2115"/>
+        <location filename="../qt-ui/models.cpp" line="2121"/>
         <source>Gas used:</source>
         <translation>Použitá zmes:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2117"/>
+        <location filename="../qt-ui/models.cpp" line="2123"/>
         <source>Tags:</source>
         <translation>Značky:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2119"/>
+        <location filename="../qt-ui/models.cpp" line="2125"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2121"/>
+        <location filename="../qt-ui/models.cpp" line="2127"/>
         <source>Weights:</source>
         <translation>Závažia:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2126"/>
+        <location filename="../qt-ui/models.cpp" line="2132"/>
         <source>Notes:</source>
         <translation>Poznámky:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2133"/>
+        <location filename="../qt-ui/models.cpp" line="2139"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2135"/>
+        <location filename="../qt-ui/models.cpp" line="2141"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2137"/>
+        <location filename="../qt-ui/models.cpp" line="2143"/>
         <source>Suit:</source>
         <translation>Oblek:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2139"/>
+        <location filename="../qt-ui/models.cpp" line="2145"/>
         <source>Viz:</source>
         <translation>Viď:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2141"/>
+        <location filename="../qt-ui/models.cpp" line="2147"/>
         <source>Rating:</source>
         <translation>Hodnotenie:</translation>
     </message>
@@ -4167,103 +4412,108 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="628"/>
         <source> (#%1 of %2)</source>
         <translation> (#%1 z %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="630"/>
+        <source>Unknown dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="647"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1168"/>
         <source>Make first divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Delete this divecomputer</source>
         <translation>Zmazať tento počítač</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1184"/>
         <source>Add gas change</source>
         <translation>Pridaj zmenu zmesi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1187"/>
         <source> (Tank %1)</source>
         <translation> (Fľaša %1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1195"/>
         <source>Add set-point change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1197"/>
         <source>Add bookmark</source>
         <translation>Pridať Bookmark</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
         <source>Remove event</source>
         <translation>Vymazať udalosť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1206"/>
         <source>Hide similar events</source>
         <translation>Schovaj podobné udalosti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1213"/>
         <source>Edit name</source>
         <translation>Editovať meno</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1242"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1249"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1264"/>
         <source>Unhide all events</source>
         <translation>Zobraziť všetky udalosti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide events</source>
         <translation>Schovaj udalosti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide all %1 events?</source>
         <translation>Schovať všetky %1 udalosti?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1333"/>
         <source>Remove the selected event?</source>
         <translation>Zmazať vybrané udalosti?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1334"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1424"/>
         <source>Edit name of bookmark</source>
         <translation>Editovať meno záložky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
         <source>Custom name:</source>
         <translation>Voliteľné meno:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1430"/>
         <source>Name is too long!</source>
         <translation>Príliš dlhý názov!</translation>
     </message>
@@ -4271,102 +4521,102 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>AIR</source>
         <translation>Vzduch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>OXYGEN</source>
         <translation>KYSLÍK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="208"/>
         <source>Remove this point</source>
         <translation>Odstrániť tento bod</translation>
     </message>
     <message>
-        <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="57"/>
         <source>Close</source>
         <translation>Zatvoriť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="42"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="25"/>
         <source>Average</source>
         <translation>Priemer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="45"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="28"/>
         <source>Minimum</source>
         <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="48"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="31"/>
         <source>Maximum</source>
         <translation>Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="297"/>
+        <location filename="../qt-ui/globe.cpp" line="296"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>Posuň mapu a dvojklikom označ miesto ponoru</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="525"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="526"/>
         <source>lbs</source>
         <translation>US libra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="550"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="551"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="570"/>
+        <location filename="../qt-ui/models.cpp" line="574"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="571"/>
+        <location filename="../qt-ui/models.cpp" line="575"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="595"/>
+        <location filename="../qt-ui/models.cpp" line="599"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="596"/>
+        <location filename="../qt-ui/models.cpp" line="600"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="513"/>
         <source>Invalid response from server</source>
         <translation>Neplatná odpoveď zo servera</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="567"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation>Očakávaný XML tag &apos;DiveDates&apos; nebol nájdený</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Nekorektná XML odpoveď. Riadok %1: %2</translation>
     </message>
@@ -4374,12 +4624,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1450"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1518"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Táto funkcia pre daný počítač zatiaľ nie je k dispozícii.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1442"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Nie je možné vytvoriť spojenie s počítačom.</translation>
     </message>
@@ -4393,12 +4643,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
-        <location filename="../qt-ui/simplewidgets.cpp" line="151"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="134"/>
         <source>New starting number</source>
         <translation>Nové začiatočné číslo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="149"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="132"/>
         <source>New number</source>
         <translation>Nové číslo</translation>
     </message>
@@ -4406,12 +4656,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1575"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1653"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Daná funkcia pre zvolený počítač zatiaľ nie je k dispozícii.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1579"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1657"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Nie je možné vytvoriť spojenie s počítačom.</translation>
     </message>
@@ -4490,12 +4740,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Aký dátum a čas je zobrazený na fotke?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="276"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="259"/>
         <source>Open image file</source>
         <translation>Otvoriť súbory s obrázkami</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="278"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="261"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Grafické súbory (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -4548,7 +4798,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <name>SocialNetworkDialog</name>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="282"/>
-        <source>Dive Date: %1 
+        <source>Dive date: %1 
 </source>
         <translation type="unfinished"/>
     </message>
@@ -4572,7 +4822,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="290"/>
-        <source>Dive Location: %1 
+        <source>Dive location: %1 
 </source>
         <translation type="unfinished"/>
     </message>
@@ -4689,47 +4939,47 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="329"/>
         <source>Webservice</source>
         <translation>Webservis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="393"/>
         <source>Connecting...</source>
         <translation>Pripájam...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
         <source>Download finished</source>
         <translation>Sťahovanie ukončené</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Download error: %1</source>
         <translation>Chyba sťahovania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="436"/>
         <source>Connection error: </source>
         <translation>Chyba spojenia:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
         <source>Download successful</source>
         <translation>Sťahovanie úspešné</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="439"/>
         <source>Invalid user identifier!</source>
         <translation>Neplatný identifikátor užívateľa!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="312"/>
         <source>Enter User ID and click Download</source>
         <translation>Zadaj ID užívateľa a klikni na Stiahnutie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="442"/>
         <source>Cannot parse response!</source>
         <translation>Nemôžem spracovať odpoveď!</translation>
     </message>
@@ -4737,7 +4987,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="592"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="575"/>
         <source>Suits: </source>
         <translation>Obleky:</translation>
     </message>
@@ -4745,7 +4995,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="119"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="116"/>
         <source>No suit set</source>
         <translation type="unfinished"/>
     </message>
@@ -4762,7 +5012,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="513"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="496"/>
         <source>Tags: </source>
         <translation>Značky:</translation>
     </message>
@@ -4770,7 +5020,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="144"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="141"/>
         <source>Empty tags</source>
         <translation>Žiadne značky</translation>
     </message>
@@ -4778,17 +5028,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>Description</source>
         <translation>Popis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -4796,7 +5046,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="141"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="131"/>
         <source>Information</source>
         <translation>Informácie</translation>
     </message>
@@ -4804,7 +5054,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1090"/>
+        <location filename="../qt-ui/models.cpp" line="1094"/>
         <source> (%1 shown)</source>
         <translation type="unfinished"/>
     </message>
@@ -4812,72 +5062,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="64"/>
         <source>Check for updates.</source>
         <translation>Kontrola novšej verzie.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="66"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface nedokázal skontrolovať existenciu novšej verzie.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="70"/>
         <source>The following error occurred:</source>
         <translation>Vyskytla sa nasledujúca chyba:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="72"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
         <source>Please check your internet connection.</source>
         <translation>Prosím, skontroluj pripojenie na internet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="85"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="84"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>Používaš poslednu verziu Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="88"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>Nová verzia Subsurface je k dispozícii.&lt;br/&gt;Klikni na:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt;.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="95"/>
         <source>A new version of Subsurface is available.</source>
         <translation>K dispozícii je nová verzia Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="97"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
         <source>Latest version is %1, please check with your OS vendor for updates.</source>
         <translation>Najnovšia verzia je %1, over si možnosti OS updatu.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="103"/>
         <source>Newest release version is </source>
         <translation>Najnovšia verzia je</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="105"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
         <source>The server returned the following information:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="121"/>
         <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
         <source>Decline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="124"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
         <source>Accept</source>
         <translation>Akceptovať</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="126"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="125"/>
         <source>Automatic check for updates</source>
         <translation type="unfinished"/>
     </message>
@@ -4885,13 +5135,13 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UserManual</name>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="55"/>
+        <location filename="../qt-ui/usermanual.cpp" line="54"/>
         <source>User Manual</source>
         <translation>Užívateľská príručka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="72"/>
-        <location filename="../qt-ui/usermanual.cpp" line="78"/>
+        <location filename="../qt-ui/usermanual.cpp" line="71"/>
+        <location filename="../qt-ui/usermanual.cpp" line="77"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Neviem nájsť manuál</translation>
     </message>
@@ -4969,84 +5219,84 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
         <source>
 Operating System: %1</source>
         <translation>
 Operačný systém: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 CPU architektúra: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 Language: %1</source>
         <translation>
 Jazyk: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="93"/>
         <source>Should we ask you later?</source>
         <translation>Máme sa spýtať neskôr?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Don&apos;t ask me again</source>
         <translation>Viac sa ma nepýtajte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Ask later</source>
         <translation>Spýtajte sa neskôr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
         <source>Submit user survey.</source>
         <translation>Odoslať dotazník.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask again?</source>
         <translation>Spýtať sa znova?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="17"/>
         <source>Send</source>
         <translation>Poslať</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>OS CPU architektúra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation>Subsurface nedokázal odoslať dotazník.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="121"/>
         <source>The following error occurred:</source>
         <translation>Vyskytla sa nasledujúca chyba:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>Please check your internet connection.</source>
         <translation>Prosím, skontroluj pripojenie na internet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="131"/>
         <source>Survey successfully submitted.</source>
         <translation>Dotazník úspešne odoslaný.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="136"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation>Pri pokuse skontrolovat existenciu novšej verzie nastala chyba.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -5054,12 +5304,12 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>Description</source>
         <translation>Popis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -5107,12 +5357,12 @@ OS CPU Architecture: %1</source>
         <translation>Nahratie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="247"/>
         <source>Operation timed out</source>
         <translation>Čas operácie vypršal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="268"/>
         <source>Transferring data...</source>
         <translation>Prenášanie dát...</translation>
     </message>
@@ -5120,17 +5370,17 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Weight</source>
         <translation>Hmotnosť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="496"/>
+        <location filename="../qt-ui/models.cpp" line="500"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Kliknutím sem vymažeš tento záťažový systém.</translation>
     </message>
@@ -5138,19 +5388,19 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1479"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1487"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1497"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1555"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1566"/>
         <source>Failed!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1506"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1576"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Daná funkcia pre zvolený počítač zatiaľ nie je k dispozícii.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1580"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Nie je možné vytvoriť spojenie s počítačom.</translation>
     </message>
@@ -5158,76 +5408,76 @@ OS CPU Architecture: %1</source>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1841"/>
+        <location filename="../qt-ui/models.cpp" line="1847"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Rok 
  &gt; Mesiac / Akcia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1844"/>
+        <location filename="../qt-ui/models.cpp" line="1850"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1847"/>
+        <location filename="../qt-ui/models.cpp" line="1853"/>
         <source>Duration 
  Total</source>
         <translation>Trvanie
 Celkové</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1850"/>
+        <location filename="../qt-ui/models.cpp" line="1856"/>
         <source>
 Average</source>
         <translation>Priemer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1853"/>
+        <location filename="../qt-ui/models.cpp" line="1859"/>
         <source>
 Shortest</source>
         <translation>Najkratší</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1856"/>
+        <location filename="../qt-ui/models.cpp" line="1862"/>
         <source>
 Longest</source>
         <translation>Najdlhší</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1859"/>
+        <location filename="../qt-ui/models.cpp" line="1865"/>
         <source>Depth (%1)
  Average</source>
         <translation>Hĺbka (%1)
  Priemer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1862"/>
-        <location filename="../qt-ui/models.cpp" line="1871"/>
-        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>
 Minimum</source>
         <translation>
 Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1865"/>
-        <location filename="../qt-ui/models.cpp" line="1874"/>
-        <location filename="../qt-ui/models.cpp" line="1883"/>
+        <location filename="../qt-ui/models.cpp" line="1871"/>
+        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>
 Maximum</source>
         <translation>
 Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1874"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
  Priemer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1883"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -5308,40 +5558,40 @@ Maximum</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1508"/>
+        <location filename="../dive.c" line="1530"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) alebo (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="464"/>
+        <location filename="../divelist.c" line="467"/>
         <location filename="../equipment.c" line="81"/>
-        <location filename="../planner.c" line="1060"/>
-        <location filename="../planner.c" line="1063"/>
+        <location filename="../planner.c" line="1081"/>
+        <location filename="../planner.c" line="1084"/>
         <source>air</source>
         <translation>vzduch</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="192"/>
+        <location filename="../equipment.c" line="194"/>
         <source>integrated</source>
         <translation>integrované</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="193"/>
+        <location filename="../equipment.c" line="195"/>
         <source>belt</source>
         <translation>opasok</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="194"/>
+        <location filename="../equipment.c" line="196"/>
         <source>ankle</source>
         <translation>členok</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="195"/>
+        <location filename="../equipment.c" line="197"/>
         <source>backplate weight</source>
         <translation>backplate závažie</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="196"/>
+        <location filename="../equipment.c" line="198"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -5349,7 +5599,7 @@ Maximum</translation>
         <location filename="../file.c" line="112"/>
         <location filename="../file.c" line="434"/>
         <location filename="../file.c" line="506"/>
-        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="925"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Chyba pri načítaní &apos;%s&apos;</translation>
     </message>
@@ -5406,9 +5656,9 @@ Maximum</translation>
         <translation>Pre súbor &apos;%s&apos; nebol nájdený zodpovedajúci počítač</translation>
     </message>
     <message>
-        <location filename="../file.c" line="869"/>
-        <location filename="../file.c" line="909"/>
-        <location filename="../file.c" line="1007"/>
+        <location filename="../file.c" line="870"/>
+        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="1016"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>Maximálny počet podporovaných stĺpcov pre CSV import je %d</translation>
     </message>
@@ -5579,27 +5829,27 @@ Maximum</translation>
         <translation>neplatné číslo udalosti</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="421"/>
+        <location filename="../libdivecomputer.c" line="419"/>
         <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="427"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Error registering the data</source>
         <translation>Chyba registrácie dát</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="433"/>
         <source>Error parsing the datetime</source>
         <translation>Chyba spracovania času</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Dive %d: %s</source>
         <translation>Ponor #%d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="455"/>
+        <location filename="../libdivecomputer.c" line="454"/>
         <source>Error parsing the divetime</source>
         <translation>Chyba spracovania času ponoru</translation>
     </message>
@@ -5609,156 +5859,156 @@ Maximum</translation>
         <translation>Chyba spracovania maximálnej hĺbky</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="482"/>
+        <location filename="../libdivecomputer.c" line="483"/>
         <source>Error parsing temperature</source>
         <translation>Chyba spracovania teploty</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="501"/>
+        <location filename="../libdivecomputer.c" line="503"/>
         <source>Error parsing the gas mix count</source>
         <translation>Chyba spracovania dýchacích zmesí</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="513"/>
+        <location filename="../libdivecomputer.c" line="515"/>
         <source>Error obtaining water salinity</source>
         <translation>Chyba získania slanosti vody</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="521"/>
+        <location filename="../libdivecomputer.c" line="524"/>
         <source>Error obtaining surface pressure</source>
         <translation>Chyba pri zisťovaní tlaku na povrchu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="545"/>
+        <location filename="../libdivecomputer.c" line="549"/>
         <source>Error obtaining divemode</source>
         <translation>Chyba načítania módu ponoru</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="562"/>
+        <location filename="../libdivecomputer.c" line="569"/>
         <source>Error parsing the gas mix</source>
         <translation>Chyba spracovania zmesi plynu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="569"/>
+        <location filename="../libdivecomputer.c" line="576"/>
         <source>Error parsing the samples</source>
         <translation>Chyba spracovania vzoriek</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="706"/>
+        <location filename="../libdivecomputer.c" line="713"/>
         <source>Event: waiting for user action</source>
         <translation>Udalosť: Čakanie na vstup uživateľa</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="714"/>
+        <location filename="../libdivecomputer.c" line="721"/>
         <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="778"/>
+        <location filename="../libdivecomputer.c" line="785"/>
         <source>Error registering the event handler.</source>
         <translation>Chyba registrácia správcu udalosti.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="783"/>
+        <location filename="../libdivecomputer.c" line="790"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Chyba registrácie správcu ukončenia</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="804"/>
+        <location filename="../libdivecomputer.c" line="811"/>
         <source>Dive data import error</source>
         <translation>Chyba importu dát</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="843"/>
+        <location filename="../libdivecomputer.c" line="850"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Problém inicializácie libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="850"/>
+        <location filename="../libdivecomputer.c" line="857"/>
         <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="858"/>
+        <location filename="../libdivecomputer.c" line="865"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Nedostatočné privilégia na otvorenie zariadenia </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="506"/>
+        <location filename="../parse-xml.c" line="516"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Zvláštne percenta v %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1760"/>
+        <location filename="../parse-xml.c" line="1770"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Chyba pri spracovaní &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1989"/>
-        <location filename="../parse-xml.c" line="2137"/>
+        <location filename="../parse-xml.c" line="1999"/>
+        <location filename="../parse-xml.c" line="2147"/>
         <source>Database query dm4_events failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1996"/>
-        <location filename="../parse-xml.c" line="2144"/>
+        <location filename="../parse-xml.c" line="2006"/>
+        <location filename="../parse-xml.c" line="2154"/>
         <source>Database query dm4_tags failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2318"/>
+        <location filename="../parse-xml.c" line="2328"/>
         <source>Database query shearwater_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2325"/>
+        <location filename="../parse-xml.c" line="2335"/>
         <source>Database query shearwater_changes failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2332"/>
+        <location filename="../parse-xml.c" line="2342"/>
         <source>Database query shearwater_profile_sample failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2451"/>
+        <location filename="../parse-xml.c" line="2461"/>
         <source>Database query cobalt_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2458"/>
+        <location filename="../parse-xml.c" line="2468"/>
         <source>Database query cobalt_buddies failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2465"/>
+        <location filename="../parse-xml.c" line="2475"/>
         <source>Database query cobalt_visibility failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2472"/>
+        <location filename="../parse-xml.c" line="2482"/>
         <source>Database query cobalt_location failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2479"/>
+        <location filename="../parse-xml.c" line="2489"/>
         <source>Database query cobalt_location (site) failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2486"/>
+        <location filename="../parse-xml.c" line="2496"/>
         <source>Database query cobalt_profile_sample failed.
 </source>
         <translation type="unfinished"/>
@@ -5771,17 +6021,17 @@ Maximum</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2168"/>
-        <location filename="../parse-xml.c" line="2189"/>
-        <location filename="../parse-xml.c" line="2508"/>
-        <location filename="../parse-xml.c" line="2527"/>
+        <location filename="../parse-xml.c" line="2178"/>
+        <location filename="../parse-xml.c" line="2199"/>
+        <location filename="../parse-xml.c" line="2518"/>
+        <location filename="../parse-xml.c" line="2537"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Požiadavka na databázu zlyhala &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2848"/>
+        <location filename="../parse-xml.c" line="2909"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Neviem otvoriť šablónu </translation>
     </message>
@@ -5791,168 +6041,174 @@ Maximum</translation>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="820"/>
+        <location filename="../planner.c" line="841"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Neviem nájsť zmes %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="356"/>
+        <location filename="../planner.c" line="363"/>
         <source>Too many gas mixes</source>
         <translation>Príliš veľa zmesí</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="540"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation>Výpočet dekompresie zrušený z dôvodu píliš dlhého času</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="548"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation>na základe GFlow = %d a GFhigh = %d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="544"/>
+        <location filename="../planner.c" line="551"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface plán ponoru</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="548"/>
+        <location filename="../planner.c" line="555"/>
         <source>depth</source>
         <translation>hĺbka</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="558"/>
         <source>runtime</source>
         <translation>runtime</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="554"/>
+        <location filename="../planner.c" line="561"/>
         <source>duration</source>
         <translation>trvanie</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="557"/>
+        <location filename="../planner.c" line="564"/>
         <source>gas</source>
         <translation>plyn</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="594"/>
+        <location filename="../planner.c" line="601"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Prechod na %.*f %s v %d:%02d min - runtime %d:%02u na %s (SP = %.1fbar)
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="602"/>
+        <location filename="../planner.c" line="609"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Prechod na %.*f %s v %d:%02d min - runtime %d:%02u na %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="615"/>
+        <location filename="../planner.c" line="622"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Zostaň v %.*f %s na %d:%02d min - runtime %d:%02u na %s (SP = %.1fbar)
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="622"/>
+        <location filename="../planner.c" line="629"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Zostaň v %.*f %s na %d:%02d min - runtime %d:%02u na %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="635"/>
+        <location filename="../planner.c" line="642"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="638"/>
-        <location filename="../planner.c" line="642"/>
+        <location filename="../planner.c" line="645"/>
+        <location filename="../planner.c" line="649"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="651"/>
+        <location filename="../planner.c" line="658"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="676"/>
+        <location filename="../planner.c" line="683"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Zmena plynu na %s (SP = %.1fbar)
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="678"/>
+        <location filename="../planner.c" line="685"/>
         <source>Switch gas to %s</source>
         <translation>Zmena plynu na %s
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="697"/>
+        <location filename="../planner.c" line="704"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="699"/>
+        <location filename="../planner.c" line="706"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="710"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="705"/>
+        <location filename="../planner.c" line="712"/>
         <source>Gas consumption:</source>
         <translation>Spotreba plynu:
 </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="535"/>
-        <location filename="../planner.c" line="725"/>
-        <location filename="../planner.c" line="730"/>
-        <location filename="../planner.c" line="753"/>
+        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="732"/>
+        <location filename="../planner.c" line="737"/>
+        <location filename="../planner.c" line="762"/>
+        <location filename="../planner.c" line="772"/>
         <source>Warning:</source>
         <translation>Upozornenie:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="523"/>
+        <location filename="../planner.c" line="530"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
         <translation>VAROVANIE: TOTO JE NOVÁ IMPLEMENTÁCIA BUHLMANOVHO ALGORITMU A NA ŇOM IMPLEMENTOVANÝ PLÁNOVAČ PONOROV, KTORÝ VŠAK BOL MINIMÁLNE TESTOVANÝ. V ŽIADNOM PRÍPADE SA NEDOPORUČUJE PLÁNOVAŤ SKUTOČNÉ PONORY LEN POMOCOU TOHTO PROGRAMU.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="726"/>
+        <location filename="../planner.c" line="733"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>toto je väčšie množstvo plynu než je k dispozícií v danej fľaši!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="731"/>
+        <location filename="../planner.c" line="738"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>žiadna rezerva pre zdieľanie zmesi počas výstupu!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="733"/>
+        <location filename="../planner.c" line="740"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s z %s (%.0f%s/%.0f%s v plánovanom výstupe)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="735"/>
+        <location filename="../planner.c" line="742"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s počas plánovaného výstupu) z %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="759"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>vysoká pO₂ hodnota %.2f v %d:%02u so zmesou %s v hĺbke %.*f %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="1064"/>
+        <location filename="../planner.c" line="769"/>
+        <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="1085"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1099"/>
+        <location filename="../profile.c" line="1113"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -5961,70 +6217,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1102"/>
+        <location filename="../profile.c" line="1116"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1106"/>
+        <location filename="../profile.c" line="1120"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1112"/>
+        <location filename="../profile.c" line="1126"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1115"/>
+        <location filename="../profile.c" line="1129"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1117"/>
+        <location filename="../profile.c" line="1131"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1119"/>
+        <location filename="../profile.c" line="1133"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1121"/>
+        <location filename="../profile.c" line="1135"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1123"/>
+        <location filename="../profile.c" line="1137"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1140"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1147"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -6033,7 +6289,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1137"/>
+        <location filename="../profile.c" line="1151"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -6042,148 +6298,148 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1149"/>
+        <location filename="../profile.c" line="1163"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Bezpečnostná zastávka: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1152"/>
+        <location filename="../profile.c" line="1166"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Bezpečnostná zastávka: neznáma @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1157"/>
+        <location filename="../profile.c" line="1171"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1174"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: neznáma @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1178"/>
         <source>In deco
 </source>
         <translation>In deco
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1166"/>
+        <location filename="../profile.c" line="1180"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1183"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1172"/>
+        <location filename="../profile.c" line="1186"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1180"/>
+        <location filename="../profile.c" line="1194"/>
         <source>In deco (calc)
 </source>
         <translation>V deco (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1196"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1185"/>
+        <location filename="../profile.c" line="1199"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1188"/>
+        <location filename="../profile.c" line="1202"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Vypočítaný strop %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1194"/>
+        <location filename="../profile.c" line="1208"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Tkanivo %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1214"/>
         <source>heartbeat: %d
 </source>
         <translation>tep srdca: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1202"/>
+        <location filename="../profile.c" line="1216"/>
         <source>bearing: %d
 </source>
         <translation>smer: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1205"/>
+        <location filename="../profile.c" line="1219"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1314"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1304"/>
-        <location filename="../profile.c" line="1308"/>
-        <location filename="../profile.c" line="1312"/>
+        <location filename="../profile.c" line="1318"/>
+        <location filename="../profile.c" line="1322"/>
+        <location filename="../profile.c" line="1326"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1316"/>
+        <location filename="../profile.c" line="1330"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1334"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1324"/>
-        <location filename="../profile.c" line="1328"/>
+        <location filename="../profile.c" line="1338"/>
+        <location filename="../profile.c" line="1342"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1335"/>
+        <location filename="../profile.c" line="1349"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -6314,6 +6570,7 @@ EADD: %d%s
     </message>
     <message>
         <location filename="../dive.c" line="30"/>
+        <location filename="../equipment.c" line="85"/>
         <source>oxygen</source>
         <translation>kyslík</translation>
     </message>
@@ -6368,97 +6625,97 @@ EADD: %d%s
         <translation>(žiadné ponory)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sun</source>
         <translation>Ne</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Mon</source>
         <translation>Po</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Tue</source>
         <translation>Ut</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Wed</source>
         <translation>St</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Thu</source>
         <translation>Št</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Fri</source>
         <translation>Pi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sat</source>
         <translation>So</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>May</source>
         <translation>Máj</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Dec</source>
         <translation>Dec</translation>
     </message>
@@ -7062,13 +7319,13 @@ Je Uemis Zurich korektne pripojený?</translation>
         <translation>Plánovanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
         <source>GF low</source>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>%</source>
         <translation>%</translation>
     </message>
@@ -7078,7 +7335,7 @@ Je Uemis Zurich korektne pripojený?</translation>
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="335"/>
         <source>Drop to first depth</source>
         <translation>Priamy zostup do prvej hĺbky</translation>
     </message>
@@ -7088,69 +7345,69 @@ Je Uemis Zurich korektne pripojený?</translation>
         <translation>Posledná zastávka v 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
         <source>Plan backgas breaks</source>
         <translation>Plánovanie back gas zastávok</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="355"/>
         <source>Gas options</source>
         <translation>Nastavenia zmesi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="376"/>
         <source>Bottom SAC</source>
         <translation>SAC na dne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="383"/>
         <source>Deco SAC</source>
         <translation>SAC pri dekompresii</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="380"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="390"/>
         <source>Bottom pO₂</source>
         <translation>pO₂ na dne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="403"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="413"/>
         <source>Deco pO₂</source>
         <translation>pO₂ pri dekompresii</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="449"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="462"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="478"/>
         <source>Dive notes</source>
         <translation>Poznámky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
         <source>Display runtime</source>
         <translation>Zobraziť priebeh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <source>Display segment duration</source>
         <translation>Zobraziť trvanie segmentu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="531"/>
         <source>Display transitions in deco</source>
         <translation>Zobraziť prechody medzi deco zastávkami</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="538"/>
         <source>Verbatim dive plan</source>
         <translation>Ukecaný plán ponoru</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="387"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="410"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="397"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -7170,17 +7427,17 @@ Je Uemis Zurich korektne pripojený?</translation>
         <translation>6m na hladinu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="499"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>Zobraziť runtime zastávok (absolútny čas) v pláne ponoru</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="515"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>V pláne ponoru zobraziť trvanie (relatívny čas) zastávok</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>Zobraziť prechody v pláne ponoru alebo ich predpokladať implicitne</translation>
     </message>
diff --git a/translations/subsurface_source.ts b/translations/subsurface_source.ts
index b4f6c7eee..d37aa0305 100644
--- a/translations/subsurface_source.ts
+++ b/translations/subsurface_source.ts
@@ -5,12 +5,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="539"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="522"/>
         <source>Person: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="540"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="523"/>
         <source>Searches for buddies and divemasters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18,40 +18,188 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="233"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="230"/>
         <source>No buddies</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>ColumnNameProvider</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Dive #</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Duration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>GPS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Weight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>End pressure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Max depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Avg depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Buddy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>O₂</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>He</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="210"/>
+        <location filename="../configuredivecomputer.cpp" line="212"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="226"/>
+        <location filename="../configuredivecomputer.cpp" line="228"/>
         <source>Could not open backup file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="542"/>
+        <location filename="../configuredivecomputer.cpp" line="552"/>
         <source>Dive computer details read successfully</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="551"/>
+        <location filename="../configuredivecomputer.cpp" line="561"/>
         <source>Setting successfully written to device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="560"/>
+        <location filename="../configuredivecomputer.cpp" line="570"/>
         <source>Device firmware successfully updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="569"/>
+        <location filename="../configuredivecomputer.cpp" line="579"/>
         <source>Device settings successfully reset</source>
         <translation type="unfinished"></translation>
     </message>
@@ -849,70 +997,70 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1053"/>
         <source>Backup files (*.xml)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1037"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1040"/>
         <source>Backup succeeded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1041"/>
         <source>Your settings have been saved to: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1030"/>
         <source>Backup dive computer settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1036"/>
         <source>XML backup error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1052"/>
         <source>Restore dive computer settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1056"/>
         <source>XML restore error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1057"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1063"/>
         <source>Restore succeeded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1064"/>
         <source>Your settings have been restored successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1074"/>
         <source>Select firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1075"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -970,12 +1118,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="410"/>
         <source>Cylinder cannot be removed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="407"/>
+        <location filename="../qt-ui/models.cpp" line="411"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1051,12 +1199,12 @@
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="48"/>
         <source>Remove the selected dive computer?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="49"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
         <translation type="unfinished"></translation>
@@ -1070,22 +1218,22 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Model</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Device ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1093,117 +1241,145 @@
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="115"/>
         <source>Bailing out to OC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="117"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>DiveImportedModel</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="556"/>
+        <source>Date/time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
+        <source>Duration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
+        <source>Depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>h:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>min</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1242"/>
+        <location filename="../qt-ui/models.cpp" line="1248"/>
         <source>#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1245"/>
+        <location filename="../qt-ui/models.cpp" line="1251"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1248"/>
+        <location filename="../qt-ui/models.cpp" line="1254"/>
         <source>Rating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1254"/>
+        <location filename="../qt-ui/models.cpp" line="1260"/>
         <source>Duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1263"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>lbs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1263"/>
+        <location filename="../qt-ui/models.cpp" line="1269"/>
         <source>Suit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1266"/>
+        <location filename="../qt-ui/models.cpp" line="1272"/>
         <source>Cyl</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1269"/>
+        <location filename="../qt-ui/models.cpp" line="1275"/>
         <source>Gas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1277"/>
+        <location filename="../qt-ui/models.cpp" line="1283"/>
         <source>OTU</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1280"/>
+        <location filename="../qt-ui/models.cpp" line="1286"/>
         <source>Max CNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1283"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1211,87 +1387,87 @@
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="787"/>
+        <location filename="../qt-ui/divelistview.cpp" line="768"/>
         <source>Expand all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="788"/>
+        <location filename="../qt-ui/divelistview.cpp" line="769"/>
         <source>Collapse all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="789"/>
+        <location filename="../qt-ui/divelistview.cpp" line="770"/>
         <source>Collapse others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="791"/>
+        <location filename="../qt-ui/divelistview.cpp" line="772"/>
         <source>Remove dive(s) from trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="792"/>
+        <location filename="../qt-ui/divelistview.cpp" line="773"/>
         <source>Create new trip above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="806"/>
+        <location filename="../qt-ui/divelistview.cpp" line="787"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="808"/>
+        <location filename="../qt-ui/divelistview.cpp" line="789"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="812"/>
+        <location filename="../qt-ui/divelistview.cpp" line="793"/>
         <source>Merge trip with trip above</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="813"/>
+        <location filename="../qt-ui/divelistview.cpp" line="794"/>
         <source>Merge trip with trip below</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="817"/>
+        <location filename="../qt-ui/divelistview.cpp" line="798"/>
         <source>Delete dive(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="819"/>
+        <location filename="../qt-ui/divelistview.cpp" line="800"/>
         <source>Mark dive(s) invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="823"/>
+        <location filename="../qt-ui/divelistview.cpp" line="804"/>
         <source>Merge selected dives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="825"/>
+        <location filename="../qt-ui/divelistview.cpp" line="806"/>
         <source>Renumber dive(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="826"/>
+        <location filename="../qt-ui/divelistview.cpp" line="807"/>
         <source>Shift times</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="827"/>
+        <location filename="../qt-ui/divelistview.cpp" line="808"/>
         <source>Load images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Open image files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1476,100 +1652,100 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="268"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="68"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
         <source>Subsurface native XML format.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
         <source>Write depths of images to file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export UDDF file as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="267"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
         <source>Export CSV file as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="278"/>
         <source>Export world map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="299"/>
         <source>HTML files (*.html)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="283"/>
         <source>Export Subsurface XML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="284"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
         <source>Save image depths</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="298"/>
         <source>Export HTML files as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
         <source>Can&apos;t open file %s</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1582,246 +1758,226 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
-        <source>CSV options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="281"/>
-        <source>Pre-configured imports</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="122"/>
-        <source>Depth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="142"/>
-        <source>Stopdepth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="162"/>
-        <source>Pressure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="176"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="466"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="183"/>
-        <source>Temp</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="213"/>
-        <source>NDL</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="97"/>
+        <source>Metric</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="233"/>
-        <source>TTS</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="102"/>
+        <source>Imperial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="253"/>
-        <source>Cns</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="59"/>
+        <source>dd.mm.yyyy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="58"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="789"/>
-        <source>Field separator</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="64"/>
+        <source>mm/dd/yyyy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="35"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="363"/>
-        <source>Units</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="69"/>
+        <source>yyyy-mm-dd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="42"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="370"/>
-        <source>Metric</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
+        <source>Drag the tags above to each corresponding column below</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="47"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="375"/>
-        <source>Imperial</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+        <source>Dive #</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="169"/>
-        <source>pO₂</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+        <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="298"/>
-        <source>Manual dives</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+        <source>Duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="316"/>
-        <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+        <source>GPS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="319"/>
-        <source>Date format</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+        <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="332"/>
-        <source>dd.mm.yyyy</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+        <source>O₂</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="337"/>
-        <source>mm/dd/yyyy</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+        <source>He</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="342"/>
-        <source>yyyy-mm-dd</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="78"/>
+        <source>Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="392"/>
-        <source>Dive #</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
+        <source>Minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="426"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="439"/>
-        <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="88"/>
+        <source>Minutes:seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="429"/>
-        <source>Date</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+        <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="500"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="513"/>
-        <source>Dive duration in seconds or in min:sec format</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+        <source>Max depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="503"/>
-        <source>Duration</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+        <source>Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="574"/>
-        <source>GPS</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="591"/>
-        <source>Tags</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+        <source>Sample time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="608"/>
-        <source>Cyl size</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+        <source>Sample depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="625"/>
-        <source>Air temp</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+        <source>Sample temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="642"/>
-        <source>Start Pressure</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+        <source>Sample po2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="659"/>
-        <source>Water temp</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+        <source>Sample cns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="676"/>
-        <source>End Press</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+        <source>Sample ndl</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="693"/>
-        <source>O₂</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+        <source>Sample tts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="710"/>
-        <source>He</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+        <source>Sample stopdepth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="742"/>
-        <source>Choose duration format.</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+        <source>Samples pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="745"/>
-        <source>Duration format</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+        <source>Sample pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="758"/>
-        <source>Seconds</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+        <source>Mean depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="763"/>
-        <source>Minutes</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+        <source>Divemaster</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="768"/>
-        <source>Minutes:seconds</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+        <source>Buddy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="540"/>
-        <source>Location</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="409"/>
-        <source>Max depth</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+        <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="386"/>
-        <source>Field configuration</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+        <source>Cyl. size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="449"/>
-        <source>Mean depth</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+        <source>Start pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="483"/>
-        <source>Buddy</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+        <source>End pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="523"/>
-        <source>Notes</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+        <source>Air temp.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="557"/>
-        <source>Weight</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+        <source>Water temp.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1866,42 +2022,42 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="691"/>
         <source>Final depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="693"/>
         <source>Run time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="701"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="695"/>
         <source>Duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="703"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
         <source>Used gas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="705"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
         <source>CC set point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1044"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1051"/>
         <source>Discard the plan?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1045"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1052"/>
         <source>You are about to discard your plan.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1909,22 +2065,22 @@
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="257"/>
         <source>Dive planner points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="261"/>
         <source>Available gases</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="284"/>
         <source>Add dive data point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="304"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="293"/>
         <source>Save new</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1932,92 +2088,112 @@
 <context>
     <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
         <source>Pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
         <source>Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
         <source>Pressure S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
         <source>pN₂</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
         <source>pHe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
         <source>pO₂</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
+        <source>Setpoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
+        <source>Sensor1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
+        <source>Sensor2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
+        <source>Sensor3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
         <source>Ambient pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
-        <source>Heart Beat</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
+        <source>Heart beat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
-        <source>Gradient Factor</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/>
+        <source>Gradient factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
-        <source>Mean Depth/s</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
+        <source>Mean depth/s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
         <source>Pressure I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
         <source>User entered</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
         <source>Cylinder index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
         <source>Ceiling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
         <source>SAC</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2068,127 +2244,127 @@
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1437"/>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1443"/>
+        <location filename="../qt-ui/models.cpp" line="1489"/>
         <source>#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1440"/>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1492"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1443"/>
-        <location filename="../qt-ui/models.cpp" line="1489"/>
+        <location filename="../qt-ui/models.cpp" line="1449"/>
+        <location filename="../qt-ui/models.cpp" line="1495"/>
         <source>Rating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1452"/>
         <source>Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1458"/>
         <source>Temp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1461"/>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1458"/>
-        <location filename="../qt-ui/models.cpp" line="1504"/>
+        <location filename="../qt-ui/models.cpp" line="1464"/>
+        <location filename="../qt-ui/models.cpp" line="1510"/>
         <source>Suit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1461"/>
-        <location filename="../qt-ui/models.cpp" line="1507"/>
+        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1513"/>
         <source>Cyl</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1464"/>
-        <location filename="../qt-ui/models.cpp" line="1510"/>
+        <location filename="../qt-ui/models.cpp" line="1470"/>
+        <location filename="../qt-ui/models.cpp" line="1516"/>
         <source>Gas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1473"/>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1527"/>
         <source>Max CNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
-        <location filename="../qt-ui/models.cpp" line="1524"/>
+        <location filename="../qt-ui/models.cpp" line="1482"/>
+        <location filename="../qt-ui/models.cpp" line="1530"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1449"/>
-        <location filename="../qt-ui/models.cpp" line="1495"/>
+        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1501"/>
         <source>Duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1498"/>
+        <location filename="../qt-ui/models.cpp" line="1504"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>lbs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1470"/>
-        <location filename="../qt-ui/models.cpp" line="1518"/>
+        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1524"/>
         <source>OTU</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2196,94 +2372,94 @@
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="98"/>
         <source>no dives were selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="117"/>
         <source>failed to create zip file for upload: %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="143"/>
         <source>cannot create temporary file: %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/>
         <source>internal error: %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="169"/>
         <source>internal error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="629"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="828"/>
         <source>Done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/>
         <source>Uploading dive list...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="692"/>
         <source>Downloading dive list...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="741"/>
         <source>Downloading %1 dives...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="785"/>
         <source>Download finished - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="802"/>
         <source>Corrupted download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>The archive could not be opened:
 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
         <source>Upload failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/>
         <source>Upload successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
         <source>Login failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
         <source>Cannot parse response</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
         <source>Error: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="829"/>
         <source>Upload finished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2291,54 +2467,52 @@
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="169"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="400"/>
         <source>Retry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="264"/>
         <source>Find Uemis dive computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Log files (*.log)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="362"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="363"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="374"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="375"/>
         <source>Dump files (*.bin)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2346,7 +2520,7 @@
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="101"/>
         <source>Vendor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2356,54 +2530,74 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="31"/>
         <source>Device or mount point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="111"/>
         <source>Dive computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="132"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="45"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="80"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="94"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="52"/>
         <source>Force download of all dives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
         <source>Always prefer downloaded dives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="189"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/>
+        <source>Downloaded Dives</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
+        <source>Select all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
+        <source>Unselect all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
         <source>Save libdivecomputer logfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="87"/>
         <source>Save libdivecomputer dumpfile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
         <source>Download into new trip</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2411,12 +2605,12 @@
 <context>
     <name>ExtraDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2430,21 +2624,21 @@
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="245"/>
-        <source>Your dive profile was updated to facebook.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
-        <source>Photo Upload Failed</source>
+        <source>Your dive profile was updated to Facebook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="250"/>
-        <source>Your dive profile was not updated to facebook, 
+        <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+        <source>Photo Upload Failed</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FilterWidget</name>
@@ -2485,17 +2679,17 @@
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1544"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1621"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1624"/>
         <source>Firmware update failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1550"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1627"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2503,7 +2697,7 @@
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="128"/>
+        <location filename="../qt-ui/globe.cpp" line="119"/>
         <source>Edit selected dive locations</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2511,7 +2705,7 @@
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="566"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="549"/>
         <source>Location: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2519,7 +2713,7 @@
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="286"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="283"/>
         <source>No location set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2527,347 +2721,352 @@
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="133"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
+        <location filename="../qt-ui/maintab.cpp" line="497"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="67"/>
         <source>Coordinates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="169"/>
         <source>Divemaster</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="154"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Buddy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="222"/>
+        <location filename="../qt-ui/maintab.ui" line="277"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="186"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
         <source>Rating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="221"/>
         <source>Visibility</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="230"/>
         <source>Suit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="465"/>
+        <location filename="../qt-ui/maintab.cpp" line="470"/>
         <source>Dive notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
-        <location filename="../qt-ui/maintab.ui" line="648"/>
-        <location filename="../qt-ui/maintab.cpp" line="277"/>
+        <location filename="../qt-ui/maintab.ui" line="74"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="102"/>
+        <location filename="../qt-ui/maintab.ui" line="677"/>
+        <location filename="../qt-ui/maintab.cpp" line="279"/>
         <source>Air temp.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <location filename="../qt-ui/maintab.ui" line="667"/>
-        <location filename="../qt-ui/maintab.cpp" line="278"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.ui" line="696"/>
+        <location filename="../qt-ui/maintab.cpp" line="280"/>
         <source>Water temp.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="229"/>
-        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.ui" line="284"/>
+        <location filename="../qt-ui/maintab.cpp" line="498"/>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="369"/>
+        <location filename="../qt-ui/maintab.ui" line="398"/>
         <source>Equipment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="496"/>
+        <location filename="../qt-ui/maintab.ui" line="525"/>
         <source>Gases used</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="515"/>
+        <location filename="../qt-ui/maintab.ui" line="544"/>
         <source>Gas consumed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="553"/>
+        <location filename="../qt-ui/maintab.ui" line="582"/>
         <source>CNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="591"/>
+        <location filename="../qt-ui/maintab.ui" line="620"/>
         <source>Max. depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="629"/>
+        <location filename="../qt-ui/maintab.ui" line="658"/>
         <source>Air pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="686"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>Dive time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="845"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
         <source>Total time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="903"/>
+        <location filename="../qt-ui/maintab.ui" line="932"/>
         <source>Gas consumption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="962"/>
+        <location filename="../qt-ui/maintab.ui" line="991"/>
         <source>Extra data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="968"/>
+        <location filename="../qt-ui/maintab.ui" line="997"/>
         <source>Additional data from dive computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="54"/>
-        <location filename="../qt-ui/maintab.ui" line="458"/>
+        <location filename="../qt-ui/maintab.ui" line="83"/>
+        <location filename="../qt-ui/maintab.ui" line="487"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="61"/>
+        <location filename="../qt-ui/maintab.ui" line="90"/>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="425"/>
+        <location filename="../qt-ui/maintab.ui" line="454"/>
         <source>Dive info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="477"/>
+        <location filename="../qt-ui/maintab.ui" line="506"/>
         <source>Interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="534"/>
-        <location filename="../qt-ui/maintab.ui" line="799"/>
+        <location filename="../qt-ui/maintab.ui" line="563"/>
+        <location filename="../qt-ui/maintab.ui" line="828"/>
         <source>SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="610"/>
+        <location filename="../qt-ui/maintab.ui" line="639"/>
         <source>Avg. depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="572"/>
+        <location filename="../qt-ui/maintab.ui" line="601"/>
         <source>OTU</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="734"/>
         <source>Salinity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="742"/>
+        <location filename="../qt-ui/maintab.ui" line="771"/>
         <source>Stats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="775"/>
+        <location filename="../qt-ui/maintab.ui" line="804"/>
         <source>Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="787"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="813"/>
+        <location filename="../qt-ui/maintab.ui" line="842"/>
         <source>Duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="864"/>
+        <location filename="../qt-ui/maintab.ui" line="893"/>
         <source>Dives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="948"/>
+        <location filename="../qt-ui/maintab.ui" line="977"/>
         <source>Photos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="95"/>
+        <location filename="../qt-ui/maintab.cpp" line="87"/>
         <source>Cylinders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="99"/>
+        <location filename="../qt-ui/maintab.cpp" line="91"/>
         <source>Weights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="55"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="59"/>
+        <location filename="../qt-ui/maintab.cpp" line="50"/>
         <source>Discard changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="96"/>
+        <location filename="../qt-ui/maintab.cpp" line="88"/>
         <source>Add cylinder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="100"/>
+        <location filename="../qt-ui/maintab.cpp" line="92"/>
         <source>Add weight system</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="274"/>
+        <location filename="../qt-ui/maintab.cpp" line="276"/>
         <source>Air temp. [%1]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="275"/>
+        <location filename="../qt-ui/maintab.cpp" line="277"/>
         <source>Water temp. [%1]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="312"/>
+        <location filename="../qt-ui/maintab.cpp" line="314"/>
         <source>This trip is being edited.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="320"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Multiple dives are being edited.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.cpp" line="324"/>
         <source>This dive is being edited.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="436"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
+        <location filename="../qt-ui/maintab.cpp" line="465"/>
         <source>Trip notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="458"/>
+        <location filename="../qt-ui/maintab.cpp" line="463"/>
         <source>Trip location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="526"/>
-        <location filename="../qt-ui/maintab.cpp" line="558"/>
-        <location filename="../qt-ui/maintab.cpp" line="562"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
         <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="574"/>
         <source>/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="555"/>
+        <location filename="../qt-ui/maintab.cpp" line="563"/>
         <source>Deepest dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="556"/>
+        <location filename="../qt-ui/maintab.cpp" line="564"/>
         <source>Shallowest dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="569"/>
+        <location filename="../qt-ui/maintab.cpp" line="577"/>
         <source>Highest total SAC of a dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="578"/>
         <source>Lowest total SAC of a dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="571"/>
+        <location filename="../qt-ui/maintab.cpp" line="579"/>
         <source>Average total SAC of all selected dives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="582"/>
+        <location filename="../qt-ui/maintab.cpp" line="590"/>
         <source>Highest temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="583"/>
+        <location filename="../qt-ui/maintab.cpp" line="591"/>
         <source>Lowest temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="584"/>
+        <location filename="../qt-ui/maintab.cpp" line="592"/>
         <source>Average temperature of all selected dives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="594"/>
+        <location filename="../qt-ui/maintab.cpp" line="602"/>
         <source>Longest dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="595"/>
+        <location filename="../qt-ui/maintab.cpp" line="603"/>
         <source>Shortest dive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="596"/>
+        <location filename="../qt-ui/maintab.cpp" line="604"/>
         <source>Average length of all selected dives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="620"/>
+        <location filename="../qt-ui/maintab.cpp" line="628"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="624"/>
+        <location filename="../qt-ui/maintab.cpp" line="632"/>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="911"/>
+        <location filename="../qt-ui/maintab.cpp" line="925"/>
         <source>Discard the changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="912"/>
+        <location filename="../qt-ui/maintab.cpp" line="926"/>
         <source>You are about to discard your changes.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3010,7 +3209,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="296"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="232"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3370,90 +3569,90 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="252"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="229"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="256"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="233"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="332"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="309"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="444"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="491"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
         <source>Print runtime table</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="834"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="811"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="836"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="813"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="841"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="818"/>
         <source>Save changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1196"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1173"/>
         <source>Save file as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1337"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1314"/>
         <source>Open dive log file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="819"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="300"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="444"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="277"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1180"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1157"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="625"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="602"/>
         <source>Yearly statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1197"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1174"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1338"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1315"/>
         <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3461,7 +3660,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="651"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="634"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3469,39 +3668,39 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="239"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="243"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="244"/>
         <source>Not now</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="245"/>
         <source>Update firmware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
         <source>Firmware upgrade notice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
         <source>Save the downloaded firmware as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
         <source>HEX files (*.hex)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3509,54 +3708,69 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Open circuit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>CCR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>pSCR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>ft/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="481"/>
         <source>Last stop at 20ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="482"/>
         <source>50% avg. depth to 20ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="489"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
         <source>20ft to surface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="485"/>
         <source>m/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
         <source>Last stop at 6m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
         <source>50% avg. depth to 6m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="494"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
         <source>6m to surface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="497"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="498"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
         <source>cuft/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="506"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="507"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="500"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="501"/>
         <source>ℓ/min</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3675,6 +3889,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="816"/>
         <source>bar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3709,57 +3924,87 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="795"/>
+        <source>CCR: Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="809"/>
+        <source>Default CCR set-point for dive planning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="832"/>
+        <source>pSCR O₂ metabolism rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="839"/>
+        <source>pSCR ratio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="846"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="859"/>
+        <source>1:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="875"/>
         <source>System default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="843"/>
+        <location filename="../qt-ui/preferences.ui" line="914"/>
         <source>Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="849"/>
+        <location filename="../qt-ui/preferences.ui" line="920"/>
         <source>Proxy type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="862"/>
+        <location filename="../qt-ui/preferences.ui" line="933"/>
         <source>Host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="888"/>
+        <location filename="../qt-ui/preferences.ui" line="959"/>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="914"/>
+        <location filename="../qt-ui/preferences.ui" line="985"/>
         <source>Requires authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="934"/>
+        <location filename="../qt-ui/preferences.ui" line="1005"/>
         <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="957"/>
+        <location filename="../qt-ui/preferences.ui" line="1028"/>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="985"/>
-        <source>about:blank</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="1011"/>
-        <source>Disconnect from facebook</source>
+        <location filename="../qt-ui/preferences.ui" line="1079"/>
+        <source>Disconnect from Facebook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="824"/>
+        <location filename="../qt-ui/preferences.ui" line="895"/>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3914,52 +4159,52 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="28"/>
+        <location filename="../qt-ui/preferences.cpp" line="44"/>
         <source>No proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="29"/>
+        <location filename="../qt-ui/preferences.cpp" line="45"/>
         <source>System proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="30"/>
+        <location filename="../qt-ui/preferences.cpp" line="46"/>
         <source>HTTP proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="31"/>
+        <location filename="../qt-ui/preferences.cpp" line="47"/>
         <source>SOCKS proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="291"/>
+        <location filename="../qt-ui/preferences.cpp" line="324"/>
         <source>Restart required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="292"/>
+        <location filename="../qt-ui/preferences.cpp" line="325"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="456"/>
+        <location filename="../qt-ui/preferences.cpp" line="494"/>
         <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Open default log file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="455"/>
+        <location filename="../qt-ui/preferences.cpp" line="493"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3967,17 +4212,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="91"/>
+        <location filename="../qt-ui/printdialog.cpp" line="85"/>
         <source>&amp;Preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="88"/>
+        <location filename="../qt-ui/printdialog.cpp" line="82"/>
         <source>P&amp;rint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="103"/>
+        <location filename="../qt-ui/printdialog.cpp" line="97"/>
         <source>Print</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3985,42 +4230,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="20"/>
         <source>Dive#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="21"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="22"/>
         <source>Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="23"/>
         <source>Duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Master</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Buddy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="34"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <location filename="../qt-ui/printlayout.cpp" line="63"/>
         <source>Subsurface cannot find a usable printer on this system!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4086,72 +4331,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2095"/>
+        <location filename="../qt-ui/models.cpp" line="2101"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2100"/>
+        <location filename="../qt-ui/models.cpp" line="2106"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2103"/>
+        <location filename="../qt-ui/models.cpp" line="2109"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2110"/>
+        <location filename="../qt-ui/models.cpp" line="2116"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2115"/>
+        <location filename="../qt-ui/models.cpp" line="2121"/>
         <source>Gas used:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2117"/>
+        <location filename="../qt-ui/models.cpp" line="2123"/>
         <source>Tags:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2119"/>
+        <location filename="../qt-ui/models.cpp" line="2125"/>
         <source>SAC:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2121"/>
+        <location filename="../qt-ui/models.cpp" line="2127"/>
         <source>Weights:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2126"/>
+        <location filename="../qt-ui/models.cpp" line="2132"/>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2133"/>
+        <location filename="../qt-ui/models.cpp" line="2139"/>
         <source>Divemaster:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2135"/>
+        <location filename="../qt-ui/models.cpp" line="2141"/>
         <source>Buddy:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2137"/>
+        <location filename="../qt-ui/models.cpp" line="2143"/>
         <source>Suit:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2139"/>
+        <location filename="../qt-ui/models.cpp" line="2145"/>
         <source>Viz:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2141"/>
+        <location filename="../qt-ui/models.cpp" line="2147"/>
         <source>Rating:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4159,103 +4404,108 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="628"/>
         <source> (#%1 of %2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="630"/>
+        <source>Unknown dive computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="647"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1168"/>
         <source>Make first divecomputer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Delete this divecomputer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1184"/>
         <source>Add gas change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1187"/>
         <source> (Tank %1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1195"/>
         <source>Add set-point change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1197"/>
         <source>Add bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
         <source>Remove event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1206"/>
         <source>Hide similar events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1213"/>
         <source>Edit name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1242"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1249"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1264"/>
         <source>Unhide all events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide all %1 events?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1333"/>
         <source>Remove the selected event?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1334"/>
         <source>%1 @ %2:%3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1424"/>
         <source>Edit name of bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
         <source>Custom name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1430"/>
         <source>Name is too long!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4263,102 +4513,102 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>AIR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>OXYGEN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="208"/>
         <source>Remove this point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="57"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="42"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="25"/>
         <source>Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="45"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="28"/>
         <source>Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="48"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="31"/>
         <source>Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="297"/>
+        <location filename="../qt-ui/globe.cpp" line="296"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="525"/>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="526"/>
         <source>lbs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="550"/>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="551"/>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="570"/>
+        <location filename="../qt-ui/models.cpp" line="574"/>
         <source>psi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="571"/>
+        <location filename="../qt-ui/models.cpp" line="575"/>
         <source>bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="595"/>
+        <location filename="../qt-ui/models.cpp" line="599"/>
         <source>l</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="596"/>
+        <location filename="../qt-ui/models.cpp" line="600"/>
         <source>cuft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="513"/>
         <source>Invalid response from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="567"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4366,12 +4616,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1450"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1518"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1442"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4385,12 +4635,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
-        <location filename="../qt-ui/simplewidgets.cpp" line="151"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="134"/>
         <source>New starting number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="149"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="132"/>
         <source>New number</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4398,12 +4648,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1575"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1653"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1579"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1657"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4482,12 +4732,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="276"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="259"/>
         <source>Open image file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="278"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="261"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4540,7 +4790,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <name>SocialNetworkDialog</name>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="282"/>
-        <source>Dive Date: %1 
+        <source>Dive date: %1 
 </source>
         <translation type="unfinished"></translation>
     </message>
@@ -4564,7 +4814,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="290"/>
-        <source>Dive Location: %1 
+        <source>Dive location: %1 
 </source>
         <translation type="unfinished"></translation>
     </message>
@@ -4681,47 +4931,47 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="329"/>
         <source>Webservice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="393"/>
         <source>Connecting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
         <source>Download finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Download error: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="436"/>
         <source>Connection error: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
         <source>Download successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="439"/>
         <source>Invalid user identifier!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="312"/>
         <source>Enter User ID and click Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="442"/>
         <source>Cannot parse response!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4729,7 +4979,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="592"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="575"/>
         <source>Suits: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -4737,7 +4987,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="119"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="116"/>
         <source>No suit set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4754,7 +5004,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="513"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="496"/>
         <source>Tags: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -4762,7 +5012,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="144"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="141"/>
         <source>Empty tags</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4770,17 +5020,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>bar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4788,7 +5038,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="141"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="131"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4796,7 +5046,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1090"/>
+        <location filename="../qt-ui/models.cpp" line="1094"/>
         <source> (%1 shown)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4804,72 +5054,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="64"/>
         <source>Check for updates.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="66"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="70"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="72"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
         <source>Please check your internet connection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="85"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="84"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="88"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="95"/>
         <source>A new version of Subsurface is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="97"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
         <source>Latest version is %1, please check with your OS vendor for updates.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="103"/>
         <source>Newest release version is </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="105"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
         <source>The server returned the following information:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="121"/>
         <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
         <source>Decline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="124"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="126"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="125"/>
         <source>Automatic check for updates</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4877,13 +5127,13 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UserManual</name>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="55"/>
+        <location filename="../qt-ui/usermanual.cpp" line="54"/>
         <source>User Manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="72"/>
-        <location filename="../qt-ui/usermanual.cpp" line="78"/>
+        <location filename="../qt-ui/usermanual.cpp" line="71"/>
+        <location filename="../qt-ui/usermanual.cpp" line="77"/>
         <source>Cannot find the Subsurface manual</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4961,81 +5211,81 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
         <source>
 Operating System: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
         <source>
 CPU Architecture: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 Language: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="93"/>
         <source>Should we ask you later?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Don&apos;t ask me again</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Ask later</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
         <source>Submit user survey.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask again?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="17"/>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="121"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>Please check your internet connection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="131"/>
         <source>Survey successfully submitted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="136"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5043,12 +5293,12 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5096,12 +5346,12 @@ OS CPU Architecture: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="247"/>
         <source>Operation timed out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="268"/>
         <source>Transferring data...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5109,17 +5359,17 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="496"/>
+        <location filename="../qt-ui/models.cpp" line="500"/>
         <source>Clicking here will remove this weight system.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5127,19 +5377,19 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1479"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1487"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1497"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1555"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1566"/>
         <source>Failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1506"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1576"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1580"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5147,70 +5397,70 @@ OS CPU Architecture: %1</source>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1841"/>
+        <location filename="../qt-ui/models.cpp" line="1847"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1844"/>
+        <location filename="../qt-ui/models.cpp" line="1850"/>
         <source>#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1847"/>
+        <location filename="../qt-ui/models.cpp" line="1853"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1850"/>
+        <location filename="../qt-ui/models.cpp" line="1856"/>
         <source>
 Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1853"/>
+        <location filename="../qt-ui/models.cpp" line="1859"/>
         <source>
 Shortest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1856"/>
+        <location filename="../qt-ui/models.cpp" line="1862"/>
         <source>
 Longest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1859"/>
+        <location filename="../qt-ui/models.cpp" line="1865"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1862"/>
-        <location filename="../qt-ui/models.cpp" line="1871"/>
-        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>
 Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1865"/>
-        <location filename="../qt-ui/models.cpp" line="1874"/>
-        <location filename="../qt-ui/models.cpp" line="1883"/>
+        <location filename="../qt-ui/models.cpp" line="1871"/>
+        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>
 Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1874"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1883"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"></translation>
@@ -5290,40 +5540,40 @@ Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1508"/>
+        <location filename="../dive.c" line="1530"/>
         <source>(%s) or (%s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="464"/>
+        <location filename="../divelist.c" line="467"/>
         <location filename="../equipment.c" line="81"/>
-        <location filename="../planner.c" line="1060"/>
-        <location filename="../planner.c" line="1063"/>
+        <location filename="../planner.c" line="1081"/>
+        <location filename="../planner.c" line="1084"/>
         <source>air</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="192"/>
+        <location filename="../equipment.c" line="194"/>
         <source>integrated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="193"/>
+        <location filename="../equipment.c" line="195"/>
         <source>belt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="194"/>
+        <location filename="../equipment.c" line="196"/>
         <source>ankle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="195"/>
+        <location filename="../equipment.c" line="197"/>
         <source>backplate weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="196"/>
+        <location filename="../equipment.c" line="198"/>
         <source>clip-on</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5331,7 +5581,7 @@ Maximum</source>
         <location filename="../file.c" line="112"/>
         <location filename="../file.c" line="434"/>
         <location filename="../file.c" line="506"/>
-        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="925"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5388,9 +5638,9 @@ Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../file.c" line="869"/>
-        <location filename="../file.c" line="909"/>
-        <location filename="../file.c" line="1007"/>
+        <location filename="../file.c" line="870"/>
+        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="1016"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5561,27 +5811,27 @@ Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="421"/>
+        <location filename="../libdivecomputer.c" line="419"/>
         <source>Unable to create parser for %s %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="427"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Error registering the data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="433"/>
         <source>Error parsing the datetime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Dive %d: %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="455"/>
+        <location filename="../libdivecomputer.c" line="454"/>
         <source>Error parsing the divetime</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5591,155 +5841,155 @@ Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="482"/>
+        <location filename="../libdivecomputer.c" line="483"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="501"/>
+        <location filename="../libdivecomputer.c" line="503"/>
         <source>Error parsing the gas mix count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="513"/>
+        <location filename="../libdivecomputer.c" line="515"/>
         <source>Error obtaining water salinity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="521"/>
+        <location filename="../libdivecomputer.c" line="524"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="545"/>
+        <location filename="../libdivecomputer.c" line="549"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="562"/>
+        <location filename="../libdivecomputer.c" line="569"/>
         <source>Error parsing the gas mix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="569"/>
+        <location filename="../libdivecomputer.c" line="576"/>
         <source>Error parsing the samples</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="706"/>
+        <location filename="../libdivecomputer.c" line="713"/>
         <source>Event: waiting for user action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="714"/>
+        <location filename="../libdivecomputer.c" line="721"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="778"/>
+        <location filename="../libdivecomputer.c" line="785"/>
         <source>Error registering the event handler.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="783"/>
+        <location filename="../libdivecomputer.c" line="790"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="804"/>
+        <location filename="../libdivecomputer.c" line="811"/>
         <source>Dive data import error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="843"/>
+        <location filename="../libdivecomputer.c" line="850"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="850"/>
+        <location filename="../libdivecomputer.c" line="857"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="858"/>
+        <location filename="../libdivecomputer.c" line="865"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="506"/>
+        <location filename="../parse-xml.c" line="516"/>
         <source>Strange percentage reading %s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1760"/>
+        <location filename="../parse-xml.c" line="1770"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1989"/>
-        <location filename="../parse-xml.c" line="2137"/>
+        <location filename="../parse-xml.c" line="1999"/>
+        <location filename="../parse-xml.c" line="2147"/>
         <source>Database query dm4_events failed.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1996"/>
-        <location filename="../parse-xml.c" line="2144"/>
+        <location filename="../parse-xml.c" line="2006"/>
+        <location filename="../parse-xml.c" line="2154"/>
         <source>Database query dm4_tags failed.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2318"/>
+        <location filename="../parse-xml.c" line="2328"/>
         <source>Database query shearwater_cylinders failed.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2325"/>
+        <location filename="../parse-xml.c" line="2335"/>
         <source>Database query shearwater_changes failed.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2332"/>
+        <location filename="../parse-xml.c" line="2342"/>
         <source>Database query shearwater_profile_sample failed.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2451"/>
+        <location filename="../parse-xml.c" line="2461"/>
         <source>Database query cobalt_cylinders failed.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2458"/>
+        <location filename="../parse-xml.c" line="2468"/>
         <source>Database query cobalt_buddies failed.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2465"/>
+        <location filename="../parse-xml.c" line="2475"/>
         <source>Database query cobalt_visibility failed.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2472"/>
+        <location filename="../parse-xml.c" line="2482"/>
         <source>Database query cobalt_location failed.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2479"/>
+        <location filename="../parse-xml.c" line="2489"/>
         <source>Database query cobalt_location (site) failed.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2486"/>
+        <location filename="../parse-xml.c" line="2496"/>
         <source>Database query cobalt_profile_sample failed.
 </source>
         <translation type="unfinished"></translation>
@@ -5751,16 +6001,16 @@ Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2168"/>
-        <location filename="../parse-xml.c" line="2189"/>
-        <location filename="../parse-xml.c" line="2508"/>
-        <location filename="../parse-xml.c" line="2527"/>
+        <location filename="../parse-xml.c" line="2178"/>
+        <location filename="../parse-xml.c" line="2199"/>
+        <location filename="../parse-xml.c" line="2518"/>
+        <location filename="../parse-xml.c" line="2537"/>
         <source>Database query failed &apos;%s&apos;.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2848"/>
+        <location filename="../parse-xml.c" line="2909"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5770,361 +6020,367 @@ Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="820"/>
+        <location filename="../planner.c" line="841"/>
         <source>Can&apos;t find gas %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="356"/>
+        <location filename="../planner.c" line="363"/>
         <source>Too many gas mixes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="540"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="548"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="544"/>
+        <location filename="../planner.c" line="551"/>
         <source>Subsurface dive plan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="548"/>
+        <location filename="../planner.c" line="555"/>
         <source>depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="558"/>
         <source>runtime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="554"/>
+        <location filename="../planner.c" line="561"/>
         <source>duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="557"/>
+        <location filename="../planner.c" line="564"/>
         <source>gas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="594"/>
+        <location filename="../planner.c" line="601"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="602"/>
+        <location filename="../planner.c" line="609"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="615"/>
+        <location filename="../planner.c" line="622"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="622"/>
+        <location filename="../planner.c" line="629"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="635"/>
+        <location filename="../planner.c" line="642"/>
         <source>%3.0f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="638"/>
-        <location filename="../planner.c" line="642"/>
+        <location filename="../planner.c" line="645"/>
+        <location filename="../planner.c" line="649"/>
         <source>%3dmin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="651"/>
+        <location filename="../planner.c" line="658"/>
         <source>(SP = %.1fbar)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="676"/>
+        <location filename="../planner.c" line="683"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="678"/>
+        <location filename="../planner.c" line="685"/>
         <source>Switch gas to %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="697"/>
+        <location filename="../planner.c" line="704"/>
         <source>CNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="699"/>
+        <location filename="../planner.c" line="706"/>
         <source>OTU</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="710"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="705"/>
+        <location filename="../planner.c" line="712"/>
         <source>Gas consumption:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="535"/>
-        <location filename="../planner.c" line="725"/>
-        <location filename="../planner.c" line="730"/>
-        <location filename="../planner.c" line="753"/>
+        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="732"/>
+        <location filename="../planner.c" line="737"/>
+        <location filename="../planner.c" line="762"/>
+        <location filename="../planner.c" line="772"/>
         <source>Warning:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="523"/>
+        <location filename="../planner.c" line="530"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="726"/>
+        <location filename="../planner.c" line="733"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="731"/>
+        <location filename="../planner.c" line="738"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="733"/>
+        <location filename="../planner.c" line="740"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="735"/>
+        <location filename="../planner.c" line="742"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="759"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../planner.c" line="1064"/>
+        <location filename="../planner.c" line="769"/>
+        <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../planner.c" line="1085"/>
         <source>ean</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1099"/>
+        <location filename="../profile.c" line="1113"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1102"/>
+        <location filename="../profile.c" line="1116"/>
         <source>P: %d%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1106"/>
+        <location filename="../profile.c" line="1120"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1112"/>
+        <location filename="../profile.c" line="1126"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1115"/>
+        <location filename="../profile.c" line="1129"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1117"/>
+        <location filename="../profile.c" line="1131"/>
         <source>CNS: %u%%
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1119"/>
+        <location filename="../profile.c" line="1133"/>
         <source>pO%s: %.2fbar
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1121"/>
+        <location filename="../profile.c" line="1135"/>
         <source>pN%s: %.2fbar
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1123"/>
+        <location filename="../profile.c" line="1137"/>
         <source>pHe: %.2fbar
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1140"/>
         <source>MOD: %d%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1147"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1137"/>
+        <location filename="../profile.c" line="1151"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1149"/>
+        <location filename="../profile.c" line="1163"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1152"/>
+        <location filename="../profile.c" line="1166"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1157"/>
+        <location filename="../profile.c" line="1171"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1174"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1178"/>
         <source>In deco
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1166"/>
+        <location filename="../profile.c" line="1180"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1183"/>
         <source>TTS: %umin
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1172"/>
+        <location filename="../profile.c" line="1186"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1180"/>
+        <location filename="../profile.c" line="1194"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1196"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1185"/>
+        <location filename="../profile.c" line="1199"/>
         <source>TTS: %umin (calc)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1188"/>
+        <location filename="../profile.c" line="1202"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1194"/>
+        <location filename="../profile.c" line="1208"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1214"/>
         <source>heartbeat: %d
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1202"/>
+        <location filename="../profile.c" line="1216"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1205"/>
+        <location filename="../profile.c" line="1219"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1314"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1304"/>
-        <location filename="../profile.c" line="1308"/>
-        <location filename="../profile.c" line="1312"/>
+        <location filename="../profile.c" line="1318"/>
+        <location filename="../profile.c" line="1322"/>
+        <location filename="../profile.c" line="1326"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1316"/>
+        <location filename="../profile.c" line="1330"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1334"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1324"/>
-        <location filename="../profile.c" line="1328"/>
+        <location filename="../profile.c" line="1338"/>
+        <location filename="../profile.c" line="1342"/>
         <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1335"/>
+        <location filename="../profile.c" line="1349"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6255,6 +6511,7 @@ EADD: %d%s
     </message>
     <message>
         <location filename="../dive.c" line="30"/>
+        <location filename="../equipment.c" line="85"/>
         <source>oxygen</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6309,97 +6566,97 @@ EADD: %d%s
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Apr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>May</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Aug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6998,13 +7255,13 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
         <source>GF low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>%</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7014,7 +7271,7 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="335"/>
         <source>Drop to first depth</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7024,69 +7281,69 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
         <source>Plan backgas breaks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="355"/>
         <source>Gas options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="376"/>
         <source>Bottom SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="383"/>
         <source>Deco SAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="380"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="390"/>
         <source>Bottom pO₂</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="403"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="413"/>
         <source>Deco pO₂</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="449"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="462"/>
         <source>ℓ/min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="478"/>
         <source>Dive notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
         <source>Display runtime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <source>Display segment duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="531"/>
         <source>Display transitions in deco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="538"/>
         <source>Verbatim dive plan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="387"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="410"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="397"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="420"/>
         <source>bar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7106,17 +7363,17 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="499"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="515"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/translations/subsurface_sv_SE.ts b/translations/subsurface_sv_SE.ts
index a0ad59854..cd973f839 100644
--- a/translations/subsurface_sv_SE.ts
+++ b/translations/subsurface_sv_SE.ts
@@ -3,12 +3,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="539"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="522"/>
         <source>Person: </source>
         <translation>Person:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="540"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="523"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Sök efter parkamrater och divemasters</translation>
     </message>
@@ -16,40 +16,188 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="233"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="230"/>
         <source>No buddies</source>
         <translation>Inga parkamrater</translation>
     </message>
 </context>
 <context>
+    <name>ColumnNameProvider</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>GPS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Avg depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="210"/>
+        <location filename="../configuredivecomputer.cpp" line="212"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation>Kunde inte spara backupfilen %1. Felmeddelande: %2</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="226"/>
+        <location filename="../configuredivecomputer.cpp" line="228"/>
         <source>Could not open backup file: %1</source>
         <translation>Kunde inte öppna backupfilen: %1</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="542"/>
+        <location filename="../configuredivecomputer.cpp" line="552"/>
         <source>Dive computer details read successfully</source>
         <translation>Dykdatorns detaljer lästa</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="551"/>
+        <location filename="../configuredivecomputer.cpp" line="561"/>
         <source>Setting successfully written to device</source>
         <translation>Inställningarna sparade till enheten</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="560"/>
+        <location filename="../configuredivecomputer.cpp" line="570"/>
         <source>Device firmware successfully updated</source>
         <translation>Enhetens firmware uppdaterades framgångsrikt</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="569"/>
+        <location filename="../configuredivecomputer.cpp" line="579"/>
         <source>Device settings successfully reset</source>
         <translation>Enhetens inställningar återställdes</translation>
     </message>
@@ -847,72 +995,72 @@
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1053"/>
         <source>Backup files (*.xml)</source>
         <translation>Backupfiler (*.xml)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1037"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>Ett fel inträffade när backupfilen skulle sparas.
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1040"/>
         <source>Backup succeeded</source>
         <translation>Backup sparad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1041"/>
         <source>Your settings have been saved to: %1</source>
         <translation>Dina inställningar har blivit sparade till: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1030"/>
         <source>Backup dive computer settings</source>
         <translation>Backuppa dykdatorns inställningar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1036"/>
         <source>XML backup error</source>
         <translation>XML backup fel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1052"/>
         <source>Restore dive computer settings</source>
         <translation>Återställ dykdatorns inställningar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1056"/>
         <source>XML restore error</source>
         <translation>XML återställningsfel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1057"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>Ett fel inträffade när backupfilen skulle återställas.
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1063"/>
         <source>Restore succeeded</source>
         <translation>Återställda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1064"/>
         <source>Your settings have been restored successfully.</source>
         <translation>Dina inställningar har blivit återställda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1074"/>
         <source>Select firmware file</source>
         <translation>Välj en firmware-fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1075"/>
         <source>All files (*.*)</source>
         <translation>Alla filer (*.*)</translation>
     </message>
@@ -970,12 +1118,12 @@
         <translation>Klicka här för att ta bort denna flaska</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="410"/>
         <source>Cylinder cannot be removed</source>
         <translation>Flaska kan inte tas bort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="407"/>
+        <location filename="../qt-ui/models.cpp" line="411"/>
         <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>
@@ -1051,12 +1199,12 @@
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="48"/>
         <source>Remove the selected dive computer?</source>
         <translation>Radera vald dykdator?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="49"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
         <translation>Är du säker på att du vill
@@ -1071,22 +1219,22 @@ radera den valda dykdatorn?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Model</source>
         <translation>Modell</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Device ID</source>
         <translation>Enhetsid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Nickname</source>
         <translation>Enhetsnamn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Klicka här för att ta bort denna dykdator</translation>
     </message>
@@ -1094,117 +1242,145 @@ radera den valda dykdatorn?</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="115"/>
         <source>Bailing out to OC</source>
         <translation>Bailout till öppet system</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="117"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>start</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>slut</translation>
     </message>
 </context>
 <context>
+    <name>DiveImportedModel</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="556"/>
+        <source>Date/time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
+        <source>Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>h:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>min</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1242"/>
+        <location filename="../qt-ui/models.cpp" line="1248"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1245"/>
+        <location filename="../qt-ui/models.cpp" line="1251"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1248"/>
+        <location filename="../qt-ui/models.cpp" line="1254"/>
         <source>Rating</source>
         <translation>Rankning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Depth(%1)</source>
         <translation>Ljup(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1254"/>
+        <location filename="../qt-ui/models.cpp" line="1260"/>
         <source>Duration</source>
         <translation>Varaktighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1263"/>
         <source>Temp(%1%2)</source>
         <translation>Temperatur(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>Weight(%1)</source>
         <translation>Vikt(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1263"/>
+        <location filename="../qt-ui/models.cpp" line="1269"/>
         <source>Suit</source>
         <translation>Dräkt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1266"/>
+        <location filename="../qt-ui/models.cpp" line="1272"/>
         <source>Cyl</source>
         <translation>Cyl</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1269"/>
+        <location filename="../qt-ui/models.cpp" line="1275"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1277"/>
+        <location filename="../qt-ui/models.cpp" line="1283"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1280"/>
+        <location filename="../qt-ui/models.cpp" line="1286"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1283"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>Location</source>
         <translation>Plats</translation>
     </message>
@@ -1212,87 +1388,87 @@ radera den valda dykdatorn?</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="787"/>
+        <location filename="../qt-ui/divelistview.cpp" line="768"/>
         <source>Expand all</source>
         <translation>Expandera alla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="788"/>
+        <location filename="../qt-ui/divelistview.cpp" line="769"/>
         <source>Collapse all</source>
         <translation>Sammanslå alla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="789"/>
+        <location filename="../qt-ui/divelistview.cpp" line="770"/>
         <source>Collapse others</source>
         <translation>Fäll samman andra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="791"/>
+        <location filename="../qt-ui/divelistview.cpp" line="772"/>
         <source>Remove dive(s) from trip</source>
         <translation>Ta bort dyk från resa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="792"/>
+        <location filename="../qt-ui/divelistview.cpp" line="773"/>
         <source>Create new trip above</source>
         <translation>Ny resa ovan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="806"/>
+        <location filename="../qt-ui/divelistview.cpp" line="787"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Lägg till dyk(en) till resan ovan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="808"/>
+        <location filename="../qt-ui/divelistview.cpp" line="789"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Lägg till dyk(en) till resan nedanför</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="812"/>
+        <location filename="../qt-ui/divelistview.cpp" line="793"/>
         <source>Merge trip with trip above</source>
         <translation>Sammanfoga resa med resan ovan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="813"/>
+        <location filename="../qt-ui/divelistview.cpp" line="794"/>
         <source>Merge trip with trip below</source>
         <translation>Sammanfoga resa med resan under</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="817"/>
+        <location filename="../qt-ui/divelistview.cpp" line="798"/>
         <source>Delete dive(s)</source>
         <translation>Radera dyk(en)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="819"/>
+        <location filename="../qt-ui/divelistview.cpp" line="800"/>
         <source>Mark dive(s) invalid</source>
         <translation>Markera dyk som ogiltiga</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="823"/>
+        <location filename="../qt-ui/divelistview.cpp" line="804"/>
         <source>Merge selected dives</source>
         <translation>Slå samman valda dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="825"/>
+        <location filename="../qt-ui/divelistview.cpp" line="806"/>
         <source>Renumber dive(s)</source>
         <translation>Uppdatera numrering</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="826"/>
+        <location filename="../qt-ui/divelistview.cpp" line="807"/>
         <source>Shift times</source>
         <translation>Förskjut tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="827"/>
+        <location filename="../qt-ui/divelistview.cpp" line="808"/>
         <source>Load images</source>
         <translation>Ladda bilder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Open image files</source>
         <translation>Öppna bildfler</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Bildfiler (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -1477,100 +1653,100 @@ radera den valda dykdatorn?</translation>
         <translation>Sand</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF filer (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="268"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>CSV filer (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="68"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Generellt format som används för att utbyta data emellan olika dykrelaterade program. </translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>Kommaseparerade värden som beskriver dykprofilen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation>Dykinformationen i kommaseparerat format . Detta inkluderar de flesta av dykets detaljer men inte dykprofilen.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Skicka dykdatan till divelogs.de.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>Skicka dykdatan till websidan dive-share.appspot.com</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>HTML-export av dykplatser visualiserade på en världskarta.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurface eget XML-format.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
         <source>Write depths of images to file.</source>
         <translation>Skriv ljupet av bilderna till fil.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export UDDF file as</source>
         <translation>Exportera som UDDF fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="267"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
         <source>Export CSV file as</source>
         <translation>Exportera CSV-fil som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="278"/>
         <source>Export world map</source>
         <translation>Exportera världskarta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="299"/>
         <source>HTML files (*.html)</source>
         <translation>HTMLfiler (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="283"/>
         <source>Export Subsurface XML</source>
         <translation>Exportera Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="284"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML filer (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
         <source>Save image depths</source>
         <translation>Spara bildernas ljup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="298"/>
         <source>Export HTML files as</source>
         <translation>Exportera HTML filer son</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
         <source>Can&apos;t open file %s</source>
         <translation>Kan inte öppna fil %s</translation>
     </message>
@@ -1583,248 +1759,228 @@ radera den valda dykdatorn?</translation>
         <translation>Importera dyklogg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
-        <source>CSV options</source>
-        <translation>CSV-inställningar</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="281"/>
-        <source>Pre-configured imports</source>
-        <translation>Förkonfigurerade importer</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="122"/>
-        <source>Depth</source>
-        <translation>Djup</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="142"/>
-        <source>Stopdepth</source>
-        <translation>Stoppdjup</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="162"/>
-        <source>Pressure</source>
-        <translation>Tryck</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="176"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="466"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
         <source>Time</source>
         <translation>Tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="183"/>
-        <source>Temp</source>
-        <translation>Temp</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="213"/>
-        <source>NDL</source>
-        <translation>NDL</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="233"/>
-        <source>TTS</source>
-        <translation>TTS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="253"/>
-        <source>Cns</source>
-        <translation>Cns</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="58"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="789"/>
-        <source>Field separator</source>
-        <translation>Fältavskiljare</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="35"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="363"/>
-        <source>Units</source>
-        <translation>Enheter</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="42"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="370"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="97"/>
         <source>Metric</source>
         <translation>Metrisk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="47"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="375"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="102"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="169"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="298"/>
-        <source>Manual dives</source>
-        <translation>Manuella dykloggar</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="316"/>
-        <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source>
-        <translation>Välj ordningen på dag, månad och år för datumformatet. Fältdelarna kan vara .-/.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="319"/>
-        <source>Date format</source>
-        <translation>Datumformat</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="332"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="59"/>
         <source>dd.mm.yyyy</source>
         <translation>dd.mm.yyyy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="337"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="64"/>
         <source>mm/dd/yyyy</source>
         <translation>mm/dd/yyyy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="342"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="69"/>
         <source>yyyy-mm-dd</source>
         <translation>yyyy-mm-dd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="392"/>
-        <source>Dive #</source>
-        <translation>Dyk #</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="426"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="439"/>
-        <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source>
-        <translation>Datum på något av följande format dd.mm.yyyy, yyyy-mm-dd eller mm/dd/yyyy.</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+        <source>Dive #</source>
+        <translation>Dyk #</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="429"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="500"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="513"/>
-        <source>Dive duration in seconds or in min:sec format</source>
-        <translation>Dykets längd i sekunder eller i minuter:sekunder</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="503"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
         <source>Duration</source>
         <translation>Varaktighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="574"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="591"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
         <source>Tags</source>
         <translation>Taggar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="608"/>
-        <source>Cyl size</source>
-        <translation>Cyl storlek</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="625"/>
-        <source>Air temp</source>
-        <translation>Lufttemp</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="642"/>
-        <source>Start Pressure</source>
-        <translation>Starttryck</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="659"/>
-        <source>Water temp</source>
-        <translation>Vattentemperatur</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="676"/>
-        <source>End Press</source>
-        <translation>Sluttryck</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="693"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
         <source>O₂</source>
         <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="710"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
         <source>He</source>
         <translation>He</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="742"/>
-        <source>Choose duration format.</source>
-        <translation>Välj tidsformat</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="745"/>
-        <source>Duration format</source>
-        <translation>Varaktighets format</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="758"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="78"/>
         <source>Seconds</source>
         <translation>Sekunder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="763"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
         <source>Minutes</source>
         <translation>Minuter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="768"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="88"/>
         <source>Minutes:seconds</source>
         <translation>Minuter:sekunder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="540"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
         <source>Location</source>
         <translation>Plats</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="409"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
         <source>Max depth</source>
         <translation>Maxdjup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="386"/>
-        <source>Field configuration</source>
-        <translation>Fältkonfiguration</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+        <source>Tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+        <source>Samples pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
         <source>Mean depth</source>
         <translation>Medeldjup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="483"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
         <source>Buddy</source>
         <translation>Parkamrat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="523"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
         <source>Notes</source>
         <translation>Anteckningar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="557"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
         <source>Weight</source>
         <translation>Vikt</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DivePlanner</name>
@@ -1867,42 +2023,42 @@ radera den valda dykdatorn?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
         <source>unknown</source>
         <translation>okänd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="691"/>
         <source>Final depth</source>
         <translation>Slutdjup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="693"/>
         <source>Run time</source>
         <translation>Löptid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="701"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="695"/>
         <source>Duration</source>
         <translation>Varaktighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="703"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
         <source>Used gas</source>
         <translation>Använd gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="705"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
         <source>CC set point</source>
         <translation>CC set point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1044"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1051"/>
         <source>Discard the plan?</source>
         <translation>Kassera plan?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1045"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1052"/>
         <source>You are about to discard your plan.</source>
         <translation>Du kommer kassera din plan</translation>
     </message>
@@ -1910,22 +2066,22 @@ radera den valda dykdatorn?</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="257"/>
         <source>Dive planner points</source>
         <translation>Dykplaneringspunkter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="261"/>
         <source>Available gases</source>
         <translation>Tillgänglig gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="284"/>
         <source>Add dive data point</source>
         <translation>lägg till dykdatapunkt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="304"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="293"/>
         <source>Save new</source>
         <translation>Spara ny</translation>
     </message>
@@ -1933,92 +2089,112 @@ radera den valda dykdatorn?</translation>
 <context>
     <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Depth</source>
         <translation>Djup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
         <source>Time</source>
         <translation>Tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
         <source>Pressure</source>
         <translation>Tryck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
         <source>Color</source>
         <translation>Färg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
         <source>Pressure S</source>
         <translation>Tryck S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
+        <source>Setpoint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
+        <source>Sensor1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
+        <source>Sensor2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
+        <source>Sensor3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
         <source>Ambient pressure</source>
         <translation>Omgivande tryck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
-        <source>Heart Beat</source>
-        <translation>Hjärtslag</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
+        <source>Heart beat</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
-        <source>Gradient Factor</source>
-        <translation>Gradientfaktor</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/>
+        <source>Gradient factor</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
-        <source>Mean Depth/s</source>
-        <translation>Medeldjup</translation>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
+        <source>Mean depth/s</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
         <source>Pressure I</source>
         <translation>Tryck I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
         <source>User entered</source>
         <translation>Användarinmatad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
         <source>Cylinder index</source>
         <translation>Flaskid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
         <source>Ceiling</source>
         <translation>Tak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
@@ -2069,127 +2245,127 @@ radera den valda dykdatorn?</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1437"/>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1443"/>
+        <location filename="../qt-ui/models.cpp" line="1489"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1440"/>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1492"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1443"/>
-        <location filename="../qt-ui/models.cpp" line="1489"/>
+        <location filename="../qt-ui/models.cpp" line="1449"/>
+        <location filename="../qt-ui/models.cpp" line="1495"/>
         <source>Rating</source>
         <translation>Rankning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1452"/>
         <source>Depth</source>
         <translation>Djup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1458"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1461"/>
         <source>Weight</source>
         <translation>Vikt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>Weight(%1)</source>
         <translation>Vikt(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1458"/>
-        <location filename="../qt-ui/models.cpp" line="1504"/>
+        <location filename="../qt-ui/models.cpp" line="1464"/>
+        <location filename="../qt-ui/models.cpp" line="1510"/>
         <source>Suit</source>
         <translation>Dräkt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1461"/>
-        <location filename="../qt-ui/models.cpp" line="1507"/>
+        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1513"/>
         <source>Cyl</source>
         <translation>Cyl</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1464"/>
-        <location filename="../qt-ui/models.cpp" line="1510"/>
+        <location filename="../qt-ui/models.cpp" line="1470"/>
+        <location filename="../qt-ui/models.cpp" line="1516"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1473"/>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1527"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
-        <location filename="../qt-ui/models.cpp" line="1524"/>
+        <location filename="../qt-ui/models.cpp" line="1482"/>
+        <location filename="../qt-ui/models.cpp" line="1530"/>
         <source>Location</source>
         <translation>Plats</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>Depth(%1)</source>
         <translation>Ljup(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1449"/>
-        <location filename="../qt-ui/models.cpp" line="1495"/>
+        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1501"/>
         <source>Duration</source>
         <translation>Varaktighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1498"/>
+        <location filename="../qt-ui/models.cpp" line="1504"/>
         <source>Temp(%1%2)</source>
         <translation>Temperatur(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1470"/>
-        <location filename="../qt-ui/models.cpp" line="1518"/>
+        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1524"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -2197,95 +2373,95 @@ radera den valda dykdatorn?</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="98"/>
         <source>no dives were selected</source>
         <translation>inga dyk var markerade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="117"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>misslyckades med att skapa zipfilen för uppladdning: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="143"/>
         <source>cannot create temporary file: %s</source>
         <translation>kunde inte skapa temporär fil: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/>
         <source>internal error: %s</source>
         <translation>internt fel: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="169"/>
         <source>internal error</source>
         <translation>internt fel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="629"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="828"/>
         <source>Done</source>
         <translation>Klar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/>
         <source>Uploading dive list...</source>
         <translation>Laddar upp dyklista...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="692"/>
         <source>Downloading dive list...</source>
         <translation>Laddar ner dyklista...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="741"/>
         <source>Downloading %1 dives...</source>
         <translation>Laddar ner %1 dyk...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="785"/>
         <source>Download finished - %1</source>
         <translation>Nedladdning klar - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="802"/>
         <source>Corrupted download</source>
         <translation>Misslyckad nedladdning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Arkivet kunde inte öppnas:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
         <source>Upload failed</source>
         <translation>Uppladdning misslyckades</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/>
         <source>Upload successful</source>
         <translation>Uppladdningen lyckades</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
         <source>Login failed</source>
         <translation>Inloggning misslyckades</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
         <source>Cannot parse response</source>
         <translation>Kan inte tolka respons</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
         <source>Error: %1</source>
         <translation>Fel: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="829"/>
         <source>Upload finished</source>
         <translation>Uppladdning klar</translation>
     </message>
@@ -2293,54 +2469,52 @@ radera den valda dykdatorn?</translation>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="169"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="400"/>
         <source>Retry</source>
         <translation>Försök igen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="264"/>
         <source>Find Uemis dive computer</source>
         <translation>Hitta Uemis dykdator</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Välj fil som loggfil för nerladdningen ifrån dykdatorn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Log files (*.log)</source>
         <translation>Loggfiler (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="362"/>
         <source>Warning</source>
         <translation>Varning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="363"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>Att spara en libdivecomputer-dump kommer inte att ladda ner dyken till dyklistan.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="374"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Välj fil för binär dumpning av nerladdningen ifrån dykdatorn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="375"/>
         <source>Dump files (*.bin)</source>
         <translation>Dumpfiler (*.bin)</translation>
     </message>
@@ -2348,7 +2522,7 @@ radera den valda dykdatorn?</translation>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="101"/>
         <source>Vendor</source>
         <translation>Leverantör</translation>
     </message>
@@ -2358,54 +2532,74 @@ radera den valda dykdatorn?</translation>
         <translation>Ladda ner från dykdator</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="31"/>
         <source>Device or mount point</source>
         <translation>Enhet eller monteringspunkt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="111"/>
         <source>Dive computer</source>
         <translation>Dykdator</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="132"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="45"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="80"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="94"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="52"/>
         <source>Force download of all dives</source>
         <translation>Tvinga nedladdning av alla dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
         <source>Always prefer downloaded dives</source>
         <translation>Föredra alltid nedladdad dykinformation</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="189"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/>
+        <source>Downloaded Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
+        <source>Select all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
+        <source>Unselect all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
         <source>Save libdivecomputer logfile</source>
         <translation>Spara loggfil av nerladdningen ifrån dykdatorn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="87"/>
         <source>Save libdivecomputer dumpfile</source>
         <translation>Spara dumpfil ifrån dykdatorn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
         <source>Download into new trip</source>
         <translation>Ladda ner till ny resa</translation>
     </message>
@@ -2413,12 +2607,12 @@ radera den valda dykdatorn?</translation>
 <context>
     <name>ExtraDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Key</source>
         <translation>Nyckel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Value</source>
         <translation>Värde</translation>
     </message>
@@ -2432,21 +2626,21 @@ radera den valda dykdatorn?</translation>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="245"/>
-        <source>Your dive profile was updated to facebook.</source>
+        <source>Your dive profile was updated to Facebook.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
-        <source>Photo Upload Failed</source>
-        <translation>Fotouppladdningen misslyckades</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="250"/>
-        <source>Your dive profile was not updated to facebook, 
+        <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+        <source>Photo Upload Failed</source>
+        <translation>Fotouppladdningen misslyckades</translation>
+    </message>
 </context>
 <context>
     <name>FilterWidget</name>
@@ -2487,17 +2681,17 @@ radera den valda dykdatorn?</translation>
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1544"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1621"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Den här möjligheten är inte än tillgänglig för denna dykdator dator.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1624"/>
         <source>Firmware update failed!</source>
         <translation>Mjukvaruuppdateringen misslyckades!</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1550"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1627"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Kunde inte upprätta en koppling till dykdatorn.</translation>
     </message>
@@ -2505,7 +2699,7 @@ radera den valda dykdatorn?</translation>
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="128"/>
+        <location filename="../qt-ui/globe.cpp" line="119"/>
         <source>Edit selected dive locations</source>
         <translation>Ändra valda dykplatser</translation>
     </message>
@@ -2513,7 +2707,7 @@ radera den valda dykdatorn?</translation>
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="566"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="549"/>
         <source>Location: </source>
         <translation>Platts:</translation>
     </message>
@@ -2521,7 +2715,7 @@ radera den valda dykdatorn?</translation>
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="286"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="283"/>
         <source>No location set</source>
         <translation>Ingen plats angiven</translation>
     </message>
@@ -2529,330 +2723,335 @@ radera den valda dykdatorn?</translation>
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="133"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
+        <location filename="../qt-ui/maintab.cpp" line="497"/>
         <source>Location</source>
         <translation>Plats</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="67"/>
         <source>Coordinates</source>
         <translation>Koordinater</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="169"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="154"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Buddy</source>
         <translation>Parkamrat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="222"/>
+        <location filename="../qt-ui/maintab.ui" line="277"/>
         <source>Tags</source>
         <translation>Taggar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="186"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
         <source>Rating</source>
         <translation>Rankning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="221"/>
         <source>Visibility</source>
         <translation>Synlighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="230"/>
         <source>Suit</source>
         <translation>Dräkt</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="465"/>
+        <location filename="../qt-ui/maintab.cpp" line="470"/>
         <source>Dive notes</source>
         <translation>Dykanteckningar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
-        <location filename="../qt-ui/maintab.ui" line="648"/>
-        <location filename="../qt-ui/maintab.cpp" line="277"/>
+        <location filename="../qt-ui/maintab.ui" line="74"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="102"/>
+        <location filename="../qt-ui/maintab.ui" line="677"/>
+        <location filename="../qt-ui/maintab.cpp" line="279"/>
         <source>Air temp.</source>
         <translation>Lufttemp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <location filename="../qt-ui/maintab.ui" line="667"/>
-        <location filename="../qt-ui/maintab.cpp" line="278"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.ui" line="696"/>
+        <location filename="../qt-ui/maintab.cpp" line="280"/>
         <source>Water temp.</source>
         <translation>Vattentemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="229"/>
-        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.ui" line="284"/>
+        <location filename="../qt-ui/maintab.cpp" line="498"/>
         <source>Notes</source>
         <translation>Anteckningar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="369"/>
+        <location filename="../qt-ui/maintab.ui" line="398"/>
         <source>Equipment</source>
         <translation>Utrustning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="496"/>
+        <location filename="../qt-ui/maintab.ui" line="525"/>
         <source>Gases used</source>
         <translation>Gasanvändning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="515"/>
+        <location filename="../qt-ui/maintab.ui" line="544"/>
         <source>Gas consumed</source>
         <translation>Gasanvändning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="553"/>
+        <location filename="../qt-ui/maintab.ui" line="582"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="591"/>
+        <location filename="../qt-ui/maintab.ui" line="620"/>
         <source>Max. depth</source>
         <translation>Maxdjup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="629"/>
+        <location filename="../qt-ui/maintab.ui" line="658"/>
         <source>Air pressure</source>
         <translation>Lufttryck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="686"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>Dive time</source>
         <translation>Dyktid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="845"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
         <source>Total time</source>
         <translation>Total tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="903"/>
+        <location filename="../qt-ui/maintab.ui" line="932"/>
         <source>Gas consumption</source>
         <translation>Gasförbrukning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="962"/>
+        <location filename="../qt-ui/maintab.ui" line="991"/>
         <source>Extra data</source>
         <translation>Extra data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="968"/>
+        <location filename="../qt-ui/maintab.ui" line="997"/>
         <source>Additional data from dive computer</source>
         <translation>Extra data ifrån dykdator</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="54"/>
-        <location filename="../qt-ui/maintab.ui" line="458"/>
+        <location filename="../qt-ui/maintab.ui" line="83"/>
+        <location filename="../qt-ui/maintab.ui" line="487"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="61"/>
+        <location filename="../qt-ui/maintab.ui" line="90"/>
         <source>Time</source>
         <translation>Tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="425"/>
+        <location filename="../qt-ui/maintab.ui" line="454"/>
         <source>Dive info</source>
         <translation>Information</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="477"/>
+        <location filename="../qt-ui/maintab.ui" line="506"/>
         <source>Interval</source>
         <translation>Intervall</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="534"/>
-        <location filename="../qt-ui/maintab.ui" line="799"/>
+        <location filename="../qt-ui/maintab.ui" line="563"/>
+        <location filename="../qt-ui/maintab.ui" line="828"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="610"/>
+        <location filename="../qt-ui/maintab.ui" line="639"/>
         <source>Avg. depth</source>
         <translation>Medeldjup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="572"/>
+        <location filename="../qt-ui/maintab.ui" line="601"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="734"/>
         <source>Salinity</source>
         <translation>Salthalt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="742"/>
+        <location filename="../qt-ui/maintab.ui" line="771"/>
         <source>Stats</source>
         <translation>Statistik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="775"/>
+        <location filename="../qt-ui/maintab.ui" line="804"/>
         <source>Depth</source>
         <translation>Djup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="787"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="813"/>
+        <location filename="../qt-ui/maintab.ui" line="842"/>
         <source>Duration</source>
         <translation>Varaktighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="864"/>
+        <location filename="../qt-ui/maintab.ui" line="893"/>
         <source>Dives</source>
         <translation>Dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="948"/>
+        <location filename="../qt-ui/maintab.ui" line="977"/>
         <source>Photos</source>
         <translation>Bilder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="95"/>
+        <location filename="../qt-ui/maintab.cpp" line="87"/>
         <source>Cylinders</source>
         <translation>Flaskor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="99"/>
+        <location filename="../qt-ui/maintab.cpp" line="91"/>
         <source>Weights</source>
         <translation>Vikter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="55"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Apply changes</source>
         <translation>Applicera förändringar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="59"/>
+        <location filename="../qt-ui/maintab.cpp" line="50"/>
         <source>Discard changes</source>
         <translation>Kasta förändringar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="96"/>
+        <location filename="../qt-ui/maintab.cpp" line="88"/>
         <source>Add cylinder</source>
         <translation>Lägg till flaska</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="100"/>
+        <location filename="../qt-ui/maintab.cpp" line="92"/>
         <source>Add weight system</source>
         <translation>Lägg till viktsystem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="274"/>
+        <location filename="../qt-ui/maintab.cpp" line="276"/>
         <source>Air temp. [%1]</source>
         <translation>Lufttemperatur [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="275"/>
+        <location filename="../qt-ui/maintab.cpp" line="277"/>
         <source>Water temp. [%1]</source>
         <translation>Vattentemperatur [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="312"/>
+        <location filename="../qt-ui/maintab.cpp" line="314"/>
         <source>This trip is being edited.</source>
         <translation>Detta resmål håller på och ändras.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="320"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Multiple dives are being edited.</source>
         <translation>Flera dyk håller på och ändras.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.cpp" line="324"/>
         <source>This dive is being edited.</source>
         <translation>Detta dyk håller på och ändras.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="436"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
+        <location filename="../qt-ui/maintab.cpp" line="465"/>
         <source>Trip notes</source>
         <translation>Resmålsanteckningar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="458"/>
+        <location filename="../qt-ui/maintab.cpp" line="463"/>
         <source>Trip location</source>
         <translation>Resmål</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="526"/>
-        <location filename="../qt-ui/maintab.cpp" line="558"/>
-        <location filename="../qt-ui/maintab.cpp" line="562"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
         <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="574"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="555"/>
+        <location filename="../qt-ui/maintab.cpp" line="563"/>
         <source>Deepest dive</source>
         <translation>Djupaste dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="556"/>
+        <location filename="../qt-ui/maintab.cpp" line="564"/>
         <source>Shallowest dive</source>
         <translation>Grundaste dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="569"/>
+        <location filename="../qt-ui/maintab.cpp" line="577"/>
         <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="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="578"/>
         <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="571"/>
+        <location filename="../qt-ui/maintab.cpp" line="579"/>
         <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="582"/>
+        <location filename="../qt-ui/maintab.cpp" line="590"/>
         <source>Highest temperature</source>
         <translation>Högsta templeratur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="583"/>
+        <location filename="../qt-ui/maintab.cpp" line="591"/>
         <source>Lowest temperature</source>
         <translation>Lägsta temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="584"/>
+        <location filename="../qt-ui/maintab.cpp" line="592"/>
         <source>Average temperature of all selected dives</source>
         <translation>Snitttemperatur på alla valda dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="594"/>
+        <location filename="../qt-ui/maintab.cpp" line="602"/>
         <source>Longest dive</source>
         <translation>Längsta dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="595"/>
+        <location filename="../qt-ui/maintab.cpp" line="603"/>
         <source>Shortest dive</source>
         <translation>Kortaste dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="596"/>
+        <location filename="../qt-ui/maintab.cpp" line="604"/>
         <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="620"/>
+        <location filename="../qt-ui/maintab.cpp" line="628"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -2861,17 +3060,17 @@ mixas av luft och:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="624"/>
+        <location filename="../qt-ui/maintab.cpp" line="632"/>
         <source> and </source>
         <translation>och</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="911"/>
+        <location filename="../qt-ui/maintab.cpp" line="925"/>
         <source>Discard the changes?</source>
         <translation>Kassera ändringarna?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="912"/>
+        <location filename="../qt-ui/maintab.cpp" line="926"/>
         <source>You are about to discard your changes.</source>
         <translation>Du är påväg att kasta bort dina förändringar</translation>
     </message>
@@ -3018,7 +3217,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="296"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="232"/>
         <source>Open</source>
         <translation>Öppna</translation>
     </message>
@@ -3378,90 +3577,90 @@ p, li { white-space: pre-wrap; }
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="252"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="229"/>
         <source>Open file</source>
         <translation>Öppna fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="256"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="233"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="332"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="309"/>
         <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="444"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
         <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="491"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
         <source>Print runtime table</source>
         <translation>Skriv ut körtidstabell</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="834"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="811"/>
         <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="836"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="813"/>
         <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="841"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="818"/>
         <source>Save changes?</source>
         <translation>Spara ändringar?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1196"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1173"/>
         <source>Save file as</source>
         <translation>Spara fil som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1337"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1314"/>
         <source>Open dive log file</source>
         <translation>Öppna dyklogg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="819"/>
         <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="300"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="444"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="277"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Warning</source>
         <translation>Varning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1180"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1157"/>
         <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="625"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="602"/>
         <source>Yearly statistics</source>
         <translation>Årsstatistik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1197"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1174"/>
         <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="1338"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1315"/>
         <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source>
         <translation>Dykloggfiler Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <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>
@@ -3469,7 +3668,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="651"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="634"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Filter visar %1 (av %2) dyk</translation>
     </message>
@@ -3477,39 +3676,39 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="239"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation>Du borde uppdatera mjukvaran i din dykdator: du har version %1 men den senaste stabila versionen är %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="243"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="244"/>
         <source>Not now</source>
         <translation>Inte nu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="245"/>
         <source>Update firmware</source>
         <translation>Uppdatera firmware</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
         <source>Firmware upgrade notice</source>
         <translation>Mjukvaruuppdaterings notis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
         <source>Save the downloaded firmware as</source>
         <translation>Spara nerladdad firmware som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
         <source>HEX files (*.hex)</source>
         <translation>HEX filer (*.hex)</translation>
     </message>
@@ -3517,54 +3716,69 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Open circuit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="481"/>
         <source>Last stop at 20ft</source>
         <translation>Sista stoppet på 20ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="482"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% av snittdjup till 20ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="489"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
         <source>20ft to surface</source>
         <translation>20ft till ytan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="485"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
         <source>Last stop at 6m</source>
         <translation>Sista stoppet på 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% av snittdjup till 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="494"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
         <source>6m to surface</source>
         <translation>6m till ytan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="497"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="498"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
         <source>cuft/min</source>
         <translation>cuft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="506"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="507"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="500"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="501"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
@@ -3683,6 +3897,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="816"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -3717,57 +3932,87 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="795"/>
+        <source>CCR: Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="809"/>
+        <source>Default CCR set-point for dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="832"/>
+        <source>pSCR O₂ metabolism rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="839"/>
+        <source>pSCR ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="846"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="859"/>
+        <source>1:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="875"/>
         <source>System default</source>
         <translation>Systemets standardvärde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="843"/>
+        <location filename="../qt-ui/preferences.ui" line="914"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="849"/>
+        <location filename="../qt-ui/preferences.ui" line="920"/>
         <source>Proxy type</source>
         <translation>Proxy typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="862"/>
+        <location filename="../qt-ui/preferences.ui" line="933"/>
         <source>Host</source>
         <translation>Värd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="888"/>
+        <location filename="../qt-ui/preferences.ui" line="959"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="914"/>
+        <location filename="../qt-ui/preferences.ui" line="985"/>
         <source>Requires authentication</source>
         <translation>Kräver authentisering</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="934"/>
+        <location filename="../qt-ui/preferences.ui" line="1005"/>
         <source>Username</source>
         <translation>Användarnamn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="957"/>
+        <location filename="../qt-ui/preferences.ui" line="1028"/>
         <source>Password</source>
         <translation>Lösenord</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="985"/>
-        <source>about:blank</source>
+        <location filename="../qt-ui/preferences.ui" line="1079"/>
+        <source>Disconnect from Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1011"/>
-        <source>Disconnect from facebook</source>
-        <translation>Logga ut fron facebook</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="824"/>
+        <location filename="../qt-ui/preferences.ui" line="895"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
@@ -3922,52 +4167,52 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="28"/>
+        <location filename="../qt-ui/preferences.cpp" line="44"/>
         <source>No proxy</source>
         <translation>Ingen proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="29"/>
+        <location filename="../qt-ui/preferences.cpp" line="45"/>
         <source>System proxy</source>
         <translation>System proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="30"/>
+        <location filename="../qt-ui/preferences.cpp" line="46"/>
         <source>HTTP proxy</source>
         <translation>HTTP proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="31"/>
+        <location filename="../qt-ui/preferences.cpp" line="47"/>
         <source>SOCKS proxy</source>
         <translation>SOCKS proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="291"/>
+        <location filename="../qt-ui/preferences.cpp" line="324"/>
         <source>Restart required</source>
         <translation>Omstart krävs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="292"/>
+        <location filename="../qt-ui/preferences.cpp" line="325"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>För att ladda nytt språk fullständigt måste Subsurface startas om.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="456"/>
+        <location filename="../qt-ui/preferences.cpp" line="494"/>
         <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
         <translation>Om du klickar OK, alla inställningar i Subsurface kommer att återställas till deras standardvärden. Det här kommer att hända omedelbart.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML filer (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Open default log file</source>
         <translation>Öppna standarddykloggen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="455"/>
+        <location filename="../qt-ui/preferences.cpp" line="493"/>
         <source>Warning</source>
         <translation>Varning</translation>
     </message>
@@ -3975,17 +4220,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="91"/>
+        <location filename="../qt-ui/printdialog.cpp" line="85"/>
         <source>&amp;Preview</source>
         <translation>Förhandsvisning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="88"/>
+        <location filename="../qt-ui/printdialog.cpp" line="82"/>
         <source>P&amp;rint</source>
         <translation>Skriv ut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="103"/>
+        <location filename="../qt-ui/printdialog.cpp" line="97"/>
         <source>Print</source>
         <translation>Skriv ut</translation>
     </message>
@@ -3993,42 +4238,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="20"/>
         <source>Dive#</source>
         <translation>Dyknr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="21"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="22"/>
         <source>Depth</source>
         <translation>Djup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="23"/>
         <source>Duration</source>
         <translation>Varaktighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Master</source>
         <translation>master</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Buddy</source>
         <translation>Parkamrat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="34"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Location</source>
         <translation>Plats</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <location filename="../qt-ui/printlayout.cpp" line="63"/>
         <source>Subsurface cannot find a usable printer on this system!</source>
         <translation>Subsurface kunde inte hitta en användbar skrivare på det här systemet!</translation>
     </message>
@@ -4094,72 +4339,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2095"/>
+        <location filename="../qt-ui/models.cpp" line="2101"/>
         <source>unknown</source>
         <translation>okänd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2100"/>
+        <location filename="../qt-ui/models.cpp" line="2106"/>
         <source>Dive #%1 - %2</source>
         <translation>Dyk #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2103"/>
+        <location filename="../qt-ui/models.cpp" line="2109"/>
         <source>Max depth: %1 %2</source>
         <translation>Maxdjup: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2110"/>
+        <location filename="../qt-ui/models.cpp" line="2116"/>
         <source>Duration: %1 min</source>
         <translation>Varaktighet: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2115"/>
+        <location filename="../qt-ui/models.cpp" line="2121"/>
         <source>Gas used:</source>
         <translation>Gas använd:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2117"/>
+        <location filename="../qt-ui/models.cpp" line="2123"/>
         <source>Tags:</source>
         <translation>Taggar:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2119"/>
+        <location filename="../qt-ui/models.cpp" line="2125"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2121"/>
+        <location filename="../qt-ui/models.cpp" line="2127"/>
         <source>Weights:</source>
         <translation>Vikter:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2126"/>
+        <location filename="../qt-ui/models.cpp" line="2132"/>
         <source>Notes:</source>
         <translation>Anteckningar:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2133"/>
+        <location filename="../qt-ui/models.cpp" line="2139"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2135"/>
+        <location filename="../qt-ui/models.cpp" line="2141"/>
         <source>Buddy:</source>
         <translation>Parkamrat:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2137"/>
+        <location filename="../qt-ui/models.cpp" line="2143"/>
         <source>Suit:</source>
         <translation>Dräkt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2139"/>
+        <location filename="../qt-ui/models.cpp" line="2145"/>
         <source>Viz:</source>
         <translation>Sikt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2141"/>
+        <location filename="../qt-ui/models.cpp" line="2147"/>
         <source>Rating:</source>
         <translation>Ranking:</translation>
     </message>
@@ -4167,103 +4412,108 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="628"/>
         <source> (#%1 of %2)</source>
         <translation> (#%1 av %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="630"/>
+        <source>Unknown dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="647"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>Visa NDL / TTS stängdes av pga att det tog för lång tid att beräkna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1168"/>
         <source>Make first divecomputer</source>
         <translation>Gör till första dykdator</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Delete this divecomputer</source>
         <translation>Ta bort den här dykdatorn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1184"/>
         <source>Add gas change</source>
         <translation>Lägg till gasbyte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1187"/>
         <source> (Tank %1)</source>
         <translation> (Flaska %1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1195"/>
         <source>Add set-point change</source>
         <translation>Lägg till set-point byte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1197"/>
         <source>Add bookmark</source>
         <translation>Lägg till bokmärke</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
         <source>Remove event</source>
         <translation>Ta bort händelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1206"/>
         <source>Hide similar events</source>
         <translation>Göm liknande händelser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1213"/>
         <source>Edit name</source>
         <translation>Ändra namn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1242"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1249"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>Förändra trycket i flaska %1 (nu beräknat till %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1264"/>
         <source>Unhide all events</source>
         <translation>Visa alla händelser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide events</source>
         <translation>Göm händelser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide all %1 events?</source>
         <translation>Göm alla %1händelser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1333"/>
         <source>Remove the selected event?</source>
         <translation>Ta bort markerad händelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1334"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1424"/>
         <source>Edit name of bookmark</source>
         <translation>Ändra namnet på bokmärket</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
         <source>Custom name:</source>
         <translation>Valt namn:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1430"/>
         <source>Name is too long!</source>
         <translation>Namnet är för långt!</translation>
     </message>
@@ -4271,102 +4521,102 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>AIR</source>
         <translation>LUFT</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>OXYGEN</source>
         <translation>OXYGEN</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="208"/>
         <source>Remove this point</source>
         <translation>Ta bort denna punkt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="57"/>
         <source>Close</source>
         <translation>Stäng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="42"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="25"/>
         <source>Average</source>
         <translation>Genomsnitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="45"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="28"/>
         <source>Minimum</source>
         <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="48"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="31"/>
         <source>Maximum</source>
         <translation>Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="297"/>
+        <location filename="../qt-ui/globe.cpp" line="296"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>Flytta runt kartan och dubbelklicka för att ställa in dykplats</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="525"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="526"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="550"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="551"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="570"/>
+        <location filename="../qt-ui/models.cpp" line="574"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="571"/>
+        <location filename="../qt-ui/models.cpp" line="575"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="595"/>
+        <location filename="../qt-ui/models.cpp" line="599"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="596"/>
+        <location filename="../qt-ui/models.cpp" line="600"/>
         <source>cuft</source>
         <translation>ft³</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="513"/>
         <source>Invalid response from server</source>
         <translation>Ogiltigt svar från server</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation>Förväntade XML tag &apos;DiveDateReader&apos; men fick istället &apos;%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="567"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation>Förväntad XML tagg &apos;DiveDates&apos; gick ej att finna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Felformaterat XML svar. Rad %1: %2</translation>
     </message>
@@ -4374,12 +4624,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1450"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1518"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Den här möjligheten är inte än tillgänglig för denna dykdator dator.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1442"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Kunde inte upprätta en koppling till dykdatorn.</translation>
     </message>
@@ -4393,12 +4643,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
-        <location filename="../qt-ui/simplewidgets.cpp" line="151"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="134"/>
         <source>New starting number</source>
         <translation>Nytt startnummer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="149"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="132"/>
         <source>New number</source>
         <translation>Nytt nummer</translation>
     </message>
@@ -4406,12 +4656,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1575"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1653"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Den här möjligheten är inte än tillgänglig för denna dykdator dator.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1579"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1657"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Kunde inte upprätta en koppling till dykdatorn.</translation>
     </message>
@@ -4490,12 +4740,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Vilket datum och tid visas på bilden?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="276"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="259"/>
         <source>Open image file</source>
         <translation>Öppna bildfler</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="278"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="261"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Bildfiler (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -4548,10 +4798,9 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <name>SocialNetworkDialog</name>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="282"/>
-        <source>Dive Date: %1 
+        <source>Dive date: %1 
 </source>
-        <translation>Dykdatum: %1 
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="285"/>
@@ -4574,10 +4823,9 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="290"/>
-        <source>Dive Location: %1 
+        <source>Dive location: %1 
 </source>
-        <translation>Dykplats: %1 
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="293"/>
@@ -4695,47 +4943,47 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="329"/>
         <source>Webservice</source>
         <translation>Webbtjänst</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="393"/>
         <source>Connecting...</source>
         <translation>Ansluter...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
         <source>Download finished</source>
         <translation>Nedladdning klar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Download error: %1</source>
         <translation>Nedladdningsfel: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="436"/>
         <source>Connection error: </source>
         <translation>Kontaktfel:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
         <source>Download successful</source>
         <translation>Nedladdningen lyckades</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="439"/>
         <source>Invalid user identifier!</source>
         <translation>Ogiltigt användarid!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="312"/>
         <source>Enter User ID and click Download</source>
         <translation>Mata in användarid och klicka på nerladdning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="442"/>
         <source>Cannot parse response!</source>
         <translation>Kan inte tolka respons</translation>
     </message>
@@ -4743,7 +4991,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="592"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="575"/>
         <source>Suits: </source>
         <translation>Dräkter:</translation>
     </message>
@@ -4751,7 +4999,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="119"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="116"/>
         <source>No suit set</source>
         <translation>Ingen dräkt vald</translation>
     </message>
@@ -4768,7 +5016,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="513"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="496"/>
         <source>Tags: </source>
         <translation>Taggar:</translation>
     </message>
@@ -4776,7 +5024,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="144"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="141"/>
         <source>Empty tags</source>
         <translation>Toma taggar</translation>
     </message>
@@ -4784,17 +5032,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>Description</source>
         <translation>Beskrivning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -4802,7 +5050,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="141"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="131"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
@@ -4810,7 +5058,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1090"/>
+        <location filename="../qt-ui/models.cpp" line="1094"/>
         <source> (%1 shown)</source>
         <translation>(% visad)</translation>
     </message>
@@ -4818,72 +5066,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="64"/>
         <source>Check for updates.</source>
         <translation>Sök efter uppdateringar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="66"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface kunde inte kolla efter uppdateringar.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="70"/>
         <source>The following error occurred:</source>
         <translation>Följande fel inträffade:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="72"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
         <source>Please check your internet connection.</source>
         <translation>Verifiera att du har en fungerande uppkoppling till internet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="85"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="84"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>Du använder dig av den senaste versionen av Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="88"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>En ny version av Subsurface finns tillgänglig.&lt;br/&gt;Klicka på:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; för att ladda ner den.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="95"/>
         <source>A new version of Subsurface is available.</source>
         <translation>En ny version av Subsurface finns tillgänglig.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="97"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
         <source>Latest version is %1, please check with your OS vendor for updates.</source>
         <translation>Senaste versionen är %1, vänligen kontakta din OS distributör för uppdateringar.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="103"/>
         <source>Newest release version is </source>
         <translation>Senast släppta version är</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="105"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
         <source>The server returned the following information:</source>
         <translation>Servern returnerade följande information:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="121"/>
         <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation>Subsurface kollar varannan vecka om det har kommit en ny version. Om du inte vill att Subsurface skall göra det vänligen klicka på Avslå</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
         <source>Decline</source>
         <translation>Avslå</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="124"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
         <source>Accept</source>
         <translation>Acceptera</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="126"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="125"/>
         <source>Automatic check for updates</source>
         <translation>Sök efter uppdateringar automatiskt</translation>
     </message>
@@ -4891,13 +5139,13 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UserManual</name>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="55"/>
+        <location filename="../qt-ui/usermanual.cpp" line="54"/>
         <source>User Manual</source>
         <translation>Användarmanual</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="72"/>
-        <location filename="../qt-ui/usermanual.cpp" line="78"/>
+        <location filename="../qt-ui/usermanual.cpp" line="71"/>
+        <location filename="../qt-ui/usermanual.cpp" line="77"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Kan inte hitta Subsurface manualen</translation>
     </message>
@@ -4975,82 +5223,82 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Var importerar du data ifrån?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
         <source>
 Operating System: %1</source>
         <translation>Operativsystem: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
         <source>
 CPU Architecture: %1</source>
         <translation>CPU Arkitektur: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 Language: %1</source>
         <translation>Språk: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="93"/>
         <source>Should we ask you later?</source>
         <translation>Ska vi fråga dig senare?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Don&apos;t ask me again</source>
         <translation>Fråga inte mig igen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Ask later</source>
         <translation>Fråga senare</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
         <source>Submit user survey.</source>
         <translation>Skicka in användarundersökningen.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask again?</source>
         <translation>Fråga igen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="17"/>
         <source>Send</source>
         <translation>Skicka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>
 OS CPU Arkitektur: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation>Subsurface kunde inte skicka in användarundersökningen.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="121"/>
         <source>The following error occurred:</source>
         <translation>Följande fel inträffade:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>Please check your internet connection.</source>
         <translation>Verifiera att du har en fungerande uppkoppling till internet.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="131"/>
         <source>Survey successfully submitted.</source>
         <translation>Undersökningen har blivit inskickad.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="136"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation>Ett fel uppstod vid sökningen efter uppdateringar.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -5058,12 +5306,12 @@ OS CPU Arkitektur: %1</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>Description</source>
         <translation>Beskrivning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -5111,12 +5359,12 @@ OS CPU Arkitektur: %1</translation>
         <translation>Ladda upp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="247"/>
         <source>Operation timed out</source>
         <translation>Begäran tog för lång tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="268"/>
         <source>Transferring data...</source>
         <translation>Överför data...</translation>
     </message>
@@ -5124,17 +5372,17 @@ OS CPU Arkitektur: %1</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Weight</source>
         <translation>Vikt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="496"/>
+        <location filename="../qt-ui/models.cpp" line="500"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Klicka här för att ta bort detta viktsystem.</translation>
     </message>
@@ -5142,19 +5390,19 @@ OS CPU Arkitektur: %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1479"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1487"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1497"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1555"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1566"/>
         <source>Failed!</source>
         <translation>Misslyckad!</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1506"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1576"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Den här möjligheten är inte än tillgänglig för denna dykdator dator.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1580"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Kunde inte upprätta en koppling till dykdatorn.</translation>
     </message>
@@ -5162,76 +5410,76 @@ OS CPU Arkitektur: %1</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1841"/>
+        <location filename="../qt-ui/models.cpp" line="1847"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>År
 &gt; Månad / Resa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1844"/>
+        <location filename="../qt-ui/models.cpp" line="1850"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1847"/>
+        <location filename="../qt-ui/models.cpp" line="1853"/>
         <source>Duration 
  Total</source>
         <translation>Varaktighet
 Total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1850"/>
+        <location filename="../qt-ui/models.cpp" line="1856"/>
         <source>
 Average</source>
         <translation>Genomsnitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1853"/>
+        <location filename="../qt-ui/models.cpp" line="1859"/>
         <source>
 Shortest</source>
         <translation>Kortaste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1856"/>
+        <location filename="../qt-ui/models.cpp" line="1862"/>
         <source>
 Longest</source>
         <translation>Längsta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1859"/>
+        <location filename="../qt-ui/models.cpp" line="1865"/>
         <source>Depth (%1)
  Average</source>
         <translation>Djup (%1)
 Medel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1862"/>
-        <location filename="../qt-ui/models.cpp" line="1871"/>
-        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>
 Minimum</source>
         <translation>
 Minimum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1865"/>
-        <location filename="../qt-ui/models.cpp" line="1874"/>
-        <location filename="../qt-ui/models.cpp" line="1883"/>
+        <location filename="../qt-ui/models.cpp" line="1871"/>
+        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>
 Maximum</source>
         <translation>
 Maximum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1874"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Medel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1883"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -5312,40 +5560,40 @@ Medel</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1508"/>
+        <location filename="../dive.c" line="1530"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) eller (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="464"/>
+        <location filename="../divelist.c" line="467"/>
         <location filename="../equipment.c" line="81"/>
-        <location filename="../planner.c" line="1060"/>
-        <location filename="../planner.c" line="1063"/>
+        <location filename="../planner.c" line="1081"/>
+        <location filename="../planner.c" line="1084"/>
         <source>air</source>
         <translation>luft</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="192"/>
+        <location filename="../equipment.c" line="194"/>
         <source>integrated</source>
         <translation>integrerat</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="193"/>
+        <location filename="../equipment.c" line="195"/>
         <source>belt</source>
         <translation>bälte</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="194"/>
+        <location filename="../equipment.c" line="196"/>
         <source>ankle</source>
         <translation>ankel</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="195"/>
+        <location filename="../equipment.c" line="197"/>
         <source>backplate weight</source>
         <translation>Ryggplattans vikt</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="196"/>
+        <location filename="../equipment.c" line="198"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -5353,7 +5601,7 @@ Medel</translation>
         <location filename="../file.c" line="112"/>
         <location filename="../file.c" line="434"/>
         <location filename="../file.c" line="506"/>
-        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="925"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Kunde inte öppna &apos;%s&apos;</translation>
     </message>
@@ -5410,9 +5658,9 @@ Medel</translation>
         <translation>Ingen matchande dykdator för filen &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../file.c" line="869"/>
-        <location filename="../file.c" line="909"/>
-        <location filename="../file.c" line="1007"/>
+        <location filename="../file.c" line="870"/>
+        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="1016"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>Maximalt antalet kolumner i CSV import är %d</translation>
     </message>
@@ -5583,27 +5831,27 @@ Medel</translation>
         <translation>okänt händelsenummer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="421"/>
+        <location filename="../libdivecomputer.c" line="419"/>
         <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="427"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Error registering the data</source>
         <translation>Kunde inte registrera parser-data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="433"/>
         <source>Error parsing the datetime</source>
         <translation>Kunde inte tolka tid och datum</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Dive %d: %s</source>
         <translation>Dyk #%d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="455"/>
+        <location filename="../libdivecomputer.c" line="454"/>
         <source>Error parsing the divetime</source>
         <translation>Kunde inte tolka dyktid</translation>
     </message>
@@ -5613,166 +5861,166 @@ Medel</translation>
         <translation>Kunde inte tolka maxdjup</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="482"/>
+        <location filename="../libdivecomputer.c" line="483"/>
         <source>Error parsing temperature</source>
         <translation>Misslyckas läsa temperatur</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="501"/>
+        <location filename="../libdivecomputer.c" line="503"/>
         <source>Error parsing the gas mix count</source>
         <translation>Kunde inte tolka antal gasblandningar</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="513"/>
+        <location filename="../libdivecomputer.c" line="515"/>
         <source>Error obtaining water salinity</source>
         <translation>Kunde inte ladda vattnets salthalt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="521"/>
+        <location filename="../libdivecomputer.c" line="524"/>
         <source>Error obtaining surface pressure</source>
         <translation>Kunde inte få tag i tyck vid ytan</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="545"/>
+        <location filename="../libdivecomputer.c" line="549"/>
         <source>Error obtaining divemode</source>
         <translation>Misslyckades läsa dykläge</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="562"/>
+        <location filename="../libdivecomputer.c" line="569"/>
         <source>Error parsing the gas mix</source>
         <translation>Kunde inte tolka gasblandning</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="569"/>
+        <location filename="../libdivecomputer.c" line="576"/>
         <source>Error parsing the samples</source>
         <translation>Kunde inte tolka sampel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="706"/>
+        <location filename="../libdivecomputer.c" line="713"/>
         <source>Event: waiting for user action</source>
         <translation>Händelse: väntar på användaren</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="714"/>
+        <location filename="../libdivecomputer.c" line="721"/>
         <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="778"/>
+        <location filename="../libdivecomputer.c" line="785"/>
         <source>Error registering the event handler.</source>
         <translation>Kunde inte registrera event-funktion</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="783"/>
+        <location filename="../libdivecomputer.c" line="790"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Kunde inte registrera avbrytningsrutin</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="804"/>
+        <location filename="../libdivecomputer.c" line="811"/>
         <source>Dive data import error</source>
         <translation>Lyckades inte importera dykdata</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="843"/>
+        <location filename="../libdivecomputer.c" line="850"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Kan inte skapa libdivecomputer context</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="850"/>
+        <location filename="../libdivecomputer.c" line="857"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Kunde inte öppna fil %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="858"/>
+        <location filename="../libdivecomputer.c" line="865"/>
         <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>
     <message>
-        <location filename="../parse-xml.c" line="506"/>
+        <location filename="../parse-xml.c" line="516"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Konstig procent läsning %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1760"/>
+        <location filename="../parse-xml.c" line="1770"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Kunde inte läsa &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1989"/>
-        <location filename="../parse-xml.c" line="2137"/>
+        <location filename="../parse-xml.c" line="1999"/>
+        <location filename="../parse-xml.c" line="2147"/>
         <source>Database query dm4_events failed.
 </source>
         <translation>Databasfrågan dm4_events misslyckades.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1996"/>
-        <location filename="../parse-xml.c" line="2144"/>
+        <location filename="../parse-xml.c" line="2006"/>
+        <location filename="../parse-xml.c" line="2154"/>
         <source>Database query dm4_tags failed.
 </source>
         <translation>Databasfrågan dm4_tags misslyckades.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2318"/>
+        <location filename="../parse-xml.c" line="2328"/>
         <source>Database query shearwater_cylinders failed.
 </source>
         <translation>Databasfrågan shearwater_cylinders misslyckades.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2325"/>
+        <location filename="../parse-xml.c" line="2335"/>
         <source>Database query shearwater_changes failed.
 </source>
         <translation>Databasfrågan shearwater_changes misslyckades.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2332"/>
+        <location filename="../parse-xml.c" line="2342"/>
         <source>Database query shearwater_profile_sample failed.
 </source>
         <translation>Databasfrågan shearwater_profile_sample misslyckades.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2451"/>
+        <location filename="../parse-xml.c" line="2461"/>
         <source>Database query cobalt_cylinders failed.
 </source>
         <translation>Databasfrågan cobalt_cylinders misslyckades.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2458"/>
+        <location filename="../parse-xml.c" line="2468"/>
         <source>Database query cobalt_buddies failed.
 </source>
         <translation>Databasfrågan cobalt_buddies misslyckades.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2465"/>
+        <location filename="../parse-xml.c" line="2475"/>
         <source>Database query cobalt_visibility failed.
 </source>
         <translation>Databasfrågan cobalt_visibility misslyckades.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2472"/>
+        <location filename="../parse-xml.c" line="2482"/>
         <source>Database query cobalt_location failed.
 </source>
         <translation>Databasfrågan cobalt_loaction misslyckades.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2479"/>
+        <location filename="../parse-xml.c" line="2489"/>
         <source>Database query cobalt_location (site) failed.
 </source>
         <translation>Databasfrågan cobalt_location (plats) misslyckades.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2486"/>
+        <location filename="../parse-xml.c" line="2496"/>
         <source>Database query cobalt_profile_sample failed.
 </source>
         <translation>Databasfrågan coblat_profile_sample misslyckades.
@@ -5786,17 +6034,17 @@ Medel</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2168"/>
-        <location filename="../parse-xml.c" line="2189"/>
-        <location filename="../parse-xml.c" line="2508"/>
-        <location filename="../parse-xml.c" line="2527"/>
+        <location filename="../parse-xml.c" line="2178"/>
+        <location filename="../parse-xml.c" line="2199"/>
+        <location filename="../parse-xml.c" line="2518"/>
+        <location filename="../parse-xml.c" line="2537"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Databasfråga misslyckades &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2848"/>
+        <location filename="../parse-xml.c" line="2909"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Kunde inte öppna formatmall %s</translation>
     </message>
@@ -5806,161 +6054,167 @@ Medel</translation>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="820"/>
+        <location filename="../planner.c" line="841"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Kan inte hitta gas %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="356"/>
+        <location filename="../planner.c" line="363"/>
         <source>Too many gas mixes</source>
         <translation>För många gasblandningar</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="540"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation>Dekompressionsberäkningarna avbröts för de tog för lång tid</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="548"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation>baserad på GFlow = %d och GFhigh = %d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="544"/>
+        <location filename="../planner.c" line="551"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface dykplan</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="548"/>
+        <location filename="../planner.c" line="555"/>
         <source>depth</source>
         <translation>djup</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="558"/>
         <source>runtime</source>
         <translation>körtid</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="554"/>
+        <location filename="../planner.c" line="561"/>
         <source>duration</source>
         <translation>varaktighet</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="557"/>
+        <location filename="../planner.c" line="564"/>
         <source>gas</source>
         <translation>gas</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="594"/>
+        <location filename="../planner.c" line="601"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Förflytta till %.*f %s på %d:%02d min - körtid %d:%02u på %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="602"/>
+        <location filename="../planner.c" line="609"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Förflytta till %.*f %s på %d:%02d min - körtid %d:%02u på %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="615"/>
+        <location filename="../planner.c" line="622"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Stanna på %.*f %s i %d:%02d min - körtid %d:%02u på %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="622"/>
+        <location filename="../planner.c" line="629"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Stanna vid %.*f %s för %d:%02d min - körtid %d:%02u på %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="635"/>
+        <location filename="../planner.c" line="642"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="638"/>
-        <location filename="../planner.c" line="642"/>
+        <location filename="../planner.c" line="645"/>
+        <location filename="../planner.c" line="649"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="651"/>
+        <location filename="../planner.c" line="658"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="676"/>
+        <location filename="../planner.c" line="683"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Byt gas till %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="678"/>
+        <location filename="../planner.c" line="685"/>
         <source>Switch gas to %s</source>
         <translation>Byt gas till %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="697"/>
+        <location filename="../planner.c" line="704"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="699"/>
+        <location filename="../planner.c" line="706"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="710"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Gasförbrukning (CCR-delar exkluderade):</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="705"/>
+        <location filename="../planner.c" line="712"/>
         <source>Gas consumption:</source>
         <translation>Gasförbrukning:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="535"/>
-        <location filename="../planner.c" line="725"/>
-        <location filename="../planner.c" line="730"/>
-        <location filename="../planner.c" line="753"/>
+        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="732"/>
+        <location filename="../planner.c" line="737"/>
+        <location filename="../planner.c" line="762"/>
+        <location filename="../planner.c" line="772"/>
         <source>Warning:</source>
         <translation>Varning:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="523"/>
+        <location filename="../planner.c" line="530"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
         <translation>VARNING: DET HÄR ÄR EN NY IMPLEMENTATION AV BUHLMANN-ALGORITMEN OCH EN DYKPLANERARE BASERAD PÅ DENNA. DEN HAR BARA FÅTT EN BEGRÄNSAD MÄNGD TESTNING. VI REKOMENDERAR STARKT ATT INTE PLANERA DYK ENBART BASERADE PÅ DEN INFORMATION SOM GES HÄR.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="726"/>
+        <location filename="../planner.c" line="733"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>det här är mer gas än vad som finns tillgängligt i angiven cylinder!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="731"/>
+        <location filename="../planner.c" line="738"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>inte nog med reserver för att kunna dela gas under uppstigningen!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="733"/>
+        <location filename="../planner.c" line="740"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s av %s (%.0f%s/%.0f%s vid planerad uppstigning)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="735"/>
+        <location filename="../planner.c" line="742"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s under planerad uppstigning) av %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="759"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>högt pO₂ %.2f vid %d:%02u med gas %s på djup %.*f %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="1064"/>
+        <location filename="../planner.c" line="769"/>
+        <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="1085"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1099"/>
+        <location filename="../profile.c" line="1113"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -5969,70 +6223,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1102"/>
+        <location filename="../profile.c" line="1116"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1106"/>
+        <location filename="../profile.c" line="1120"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1112"/>
+        <location filename="../profile.c" line="1126"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1115"/>
+        <location filename="../profile.c" line="1129"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1117"/>
+        <location filename="../profile.c" line="1131"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1119"/>
+        <location filename="../profile.c" line="1133"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1121"/>
+        <location filename="../profile.c" line="1135"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1123"/>
+        <location filename="../profile.c" line="1137"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1140"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1147"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -6041,7 +6295,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1137"/>
+        <location filename="../profile.c" line="1151"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -6050,149 +6304,149 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1149"/>
+        <location filename="../profile.c" line="1163"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Säkerhetsstopp: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1152"/>
+        <location filename="../profile.c" line="1166"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Säkerhetsstopp: okänd tid @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1157"/>
+        <location filename="../profile.c" line="1171"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1174"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deko: okänd tid @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1178"/>
         <source>In deco
 </source>
         <translation>I Deko
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1166"/>
+        <location filename="../profile.c" line="1180"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1183"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1172"/>
+        <location filename="../profile.c" line="1186"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1180"/>
+        <location filename="../profile.c" line="1194"/>
         <source>In deco (calc)
 </source>
         <translation>I deko (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1196"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1185"/>
+        <location filename="../profile.c" line="1199"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1188"/>
+        <location filename="../profile.c" line="1202"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Beräknat tak %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1194"/>
+        <location filename="../profile.c" line="1208"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>Vävnad %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1214"/>
         <source>heartbeat: %d
 </source>
         <translation>hjärtrytm: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1202"/>
+        <location filename="../profile.c" line="1216"/>
         <source>bearing: %d
 </source>
         <translation>kurs: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1205"/>
+        <location filename="../profile.c" line="1219"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>medeldjup fram tills hit %.1%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1314"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1304"/>
-        <location filename="../profile.c" line="1308"/>
-        <location filename="../profile.c" line="1312"/>
+        <location filename="../profile.c" line="1318"/>
+        <location filename="../profile.c" line="1322"/>
+        <location filename="../profile.c" line="1326"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1316"/>
+        <location filename="../profile.c" line="1330"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1334"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1324"/>
-        <location filename="../profile.c" line="1328"/>
+        <location filename="../profile.c" line="1338"/>
+        <location filename="../profile.c" line="1342"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1335"/>
+        <location filename="../profile.c" line="1349"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -6323,6 +6577,7 @@ EADD: %d%s
     </message>
     <message>
         <location filename="../dive.c" line="30"/>
+        <location filename="../equipment.c" line="85"/>
         <source>oxygen</source>
         <translation>oxygen</translation>
     </message>
@@ -6377,97 +6632,97 @@ EADD: %d%s
         <translation>(inga dyk)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sun</source>
         <translation>sön</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Mon</source>
         <translation>mån</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Tue</source>
         <translation>tis</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Wed</source>
         <translation>ons</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Thu</source>
         <translation>tor</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Fri</source>
         <translation>fre</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sat</source>
         <translation>lör</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jan</source>
         <translation>jan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Feb</source>
         <translation>feb</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Mar</source>
         <translation>mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Apr</source>
         <translation>apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>May</source>
         <translation>maj</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jun</source>
         <translation>jun</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Jul</source>
         <translation>jul</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Aug</source>
         <translation>aug</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Sep</source>
         <translation>sep</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Oct</source>
         <translation>okt</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Nov</source>
         <translation>nov</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Dec</source>
         <translation>dec</translation>
     </message>
@@ -7071,13 +7326,13 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Planering</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
         <source>GF low</source>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>%</source>
         <translation>%</translation>
     </message>
@@ -7087,7 +7342,7 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="335"/>
         <source>Drop to first depth</source>
         <translation>Ner till första djup</translation>
     </message>
@@ -7097,69 +7352,69 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Sista stoppet på 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
         <source>Plan backgas breaks</source>
         <translation>Planera pauser på bakgas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="355"/>
         <source>Gas options</source>
         <translation>Gasval</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="376"/>
         <source>Bottom SAC</source>
         <translation>Botten SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="383"/>
         <source>Deco SAC</source>
         <translation>Deko SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="380"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="390"/>
         <source>Bottom pO₂</source>
         <translation>pO₂ under bottenfas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="403"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="413"/>
         <source>Deco pO₂</source>
         <translation>pO₂ under deko</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="449"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="462"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="478"/>
         <source>Dive notes</source>
         <translation>Dykanteckningar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
         <source>Display runtime</source>
         <translation>Visa körtid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <source>Display segment duration</source>
         <translation>Visa stoppens tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="531"/>
         <source>Display transitions in deco</source>
         <translation>Visa byten av djup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="538"/>
         <source>Verbatim dive plan</source>
         <translation>Utskriven dykplan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="387"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="410"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="397"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -7179,17 +7434,17 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>6m till ytan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="499"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>I dykplanen, visa körtid (absolut tid) av stop</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="515"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>I dykplanen, visa stopptid (relativ tid) av stop</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>I dykplanen, visa förflyttningar eller hantera dem som implicita</translation>
     </message>
diff --git a/translations/subsurface_tr.ts b/translations/subsurface_tr.ts
index 623763bbe..d0b671c55 100644
--- a/translations/subsurface_tr.ts
+++ b/translations/subsurface_tr.ts
@@ -3,12 +3,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="539"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="522"/>
         <source>Person: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="540"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="523"/>
         <source>Searches for buddies and divemasters</source>
         <translation type="unfinished"/>
     </message>
@@ -16,40 +16,188 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="233"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="230"/>
         <source>No buddies</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>ColumnNameProvider</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>GPS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Avg depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="210"/>
+        <location filename="../configuredivecomputer.cpp" line="212"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="226"/>
+        <location filename="../configuredivecomputer.cpp" line="228"/>
         <source>Could not open backup file: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="542"/>
+        <location filename="../configuredivecomputer.cpp" line="552"/>
         <source>Dive computer details read successfully</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="551"/>
+        <location filename="../configuredivecomputer.cpp" line="561"/>
         <source>Setting successfully written to device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="560"/>
+        <location filename="../configuredivecomputer.cpp" line="570"/>
         <source>Device firmware successfully updated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="569"/>
+        <location filename="../configuredivecomputer.cpp" line="579"/>
         <source>Device settings successfully reset</source>
         <translation type="unfinished"/>
     </message>
@@ -847,70 +995,70 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1053"/>
         <source>Backup files (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1037"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1040"/>
         <source>Backup succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1041"/>
         <source>Your settings have been saved to: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1030"/>
         <source>Backup dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1036"/>
         <source>XML backup error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1052"/>
         <source>Restore dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1056"/>
         <source>XML restore error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1057"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1063"/>
         <source>Restore succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1064"/>
         <source>Your settings have been restored successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1074"/>
         <source>Select firmware file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1075"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -968,12 +1116,12 @@
         <translation>Buraya tıklayarak bu tüp kaldırılır.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="410"/>
         <source>Cylinder cannot be removed</source>
         <translation>Tüp kaldırılamaz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="407"/>
+        <location filename="../qt-ui/models.cpp" line="411"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation type="unfinished"/>
     </message>
@@ -1049,12 +1197,12 @@
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="48"/>
         <source>Remove the selected dive computer?</source>
         <translation>Seçili dalış bilgisayarı kaldırılsın mı ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="49"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
         <translation>Seçilenleri dalış bilgisayarından
@@ -1069,22 +1217,22 @@ kaldırmak istediğinizden emin misiniz?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Model</source>
         <translation>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Device ID</source>
         <translation>Cihaz Kimliği</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Nickname</source>
         <translation>Rumuz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Buraya tıklayarak dalış bilgisayarını kaldır.</translation>
     </message>
@@ -1092,117 +1240,145 @@ kaldırmak istediğinizden emin misiniz?</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="115"/>
         <source>Bailing out to OC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="117"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>son</translation>
     </message>
 </context>
 <context>
+    <name>DiveImportedModel</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="556"/>
+        <source>Date/time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
+        <source>Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>h:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>min</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1242"/>
+        <location filename="../qt-ui/models.cpp" line="1248"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1245"/>
+        <location filename="../qt-ui/models.cpp" line="1251"/>
         <source>Date</source>
         <translation>Tarih</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1248"/>
+        <location filename="../qt-ui/models.cpp" line="1254"/>
         <source>Rating</source>
         <translation>Değerlendirme</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>ft</source>
         <translation>fit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1254"/>
+        <location filename="../qt-ui/models.cpp" line="1260"/>
         <source>Duration</source>
         <translation>Süre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1263"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>lbs</source>
         <translation>libre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1263"/>
+        <location filename="../qt-ui/models.cpp" line="1269"/>
         <source>Suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1266"/>
+        <location filename="../qt-ui/models.cpp" line="1272"/>
         <source>Cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1269"/>
+        <location filename="../qt-ui/models.cpp" line="1275"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1277"/>
+        <location filename="../qt-ui/models.cpp" line="1283"/>
         <source>OTU</source>
         <translation>OZB</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1280"/>
+        <location filename="../qt-ui/models.cpp" line="1286"/>
         <source>Max CNS</source>
         <translation>Azami MSS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1283"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>Location</source>
         <translation>Konum</translation>
     </message>
@@ -1210,87 +1386,87 @@ kaldırmak istediğinizden emin misiniz?</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="787"/>
+        <location filename="../qt-ui/divelistview.cpp" line="768"/>
         <source>Expand all</source>
         <translation>Hepsini aç</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="788"/>
+        <location filename="../qt-ui/divelistview.cpp" line="769"/>
         <source>Collapse all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="789"/>
+        <location filename="../qt-ui/divelistview.cpp" line="770"/>
         <source>Collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="791"/>
+        <location filename="../qt-ui/divelistview.cpp" line="772"/>
         <source>Remove dive(s) from trip</source>
         <translation>Geziden dalış kaldır</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="792"/>
+        <location filename="../qt-ui/divelistview.cpp" line="773"/>
         <source>Create new trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="806"/>
+        <location filename="../qt-ui/divelistview.cpp" line="787"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="808"/>
+        <location filename="../qt-ui/divelistview.cpp" line="789"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="812"/>
+        <location filename="../qt-ui/divelistview.cpp" line="793"/>
         <source>Merge trip with trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="813"/>
+        <location filename="../qt-ui/divelistview.cpp" line="794"/>
         <source>Merge trip with trip below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="817"/>
+        <location filename="../qt-ui/divelistview.cpp" line="798"/>
         <source>Delete dive(s)</source>
         <translation>Dalış sil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="819"/>
+        <location filename="../qt-ui/divelistview.cpp" line="800"/>
         <source>Mark dive(s) invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="823"/>
+        <location filename="../qt-ui/divelistview.cpp" line="804"/>
         <source>Merge selected dives</source>
         <translation>Seçili dalışları birleştir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="825"/>
+        <location filename="../qt-ui/divelistview.cpp" line="806"/>
         <source>Renumber dive(s)</source>
         <translation>Dalışları yeniden numaralandır</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="826"/>
+        <location filename="../qt-ui/divelistview.cpp" line="807"/>
         <source>Shift times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="827"/>
+        <location filename="../qt-ui/divelistview.cpp" line="808"/>
         <source>Load images</source>
         <translation>Görüntüleri yükle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Open image files</source>
         <translation>Görüntü dosyalarını aç</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Görüntü dosyaları (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -1475,100 +1651,100 @@ kaldırmak istediğinizden emin misiniz?</translation>
         <translation>kum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF dosyaları (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="268"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>CSV dosyaları (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="68"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Divelogs.de web sitesine dalış verilerini gönder.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurface doğal XML biçimi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
         <source>Write depths of images to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export UDDF file as</source>
         <translation>UDDF dosyası olarak dışarı aktar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="267"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
         <source>Export CSV file as</source>
         <translation>CSV dosyası olarak dışarı aktar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="278"/>
         <source>Export world map</source>
         <translation>Dünya haritasını dışarı aktar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="299"/>
         <source>HTML files (*.html)</source>
         <translation>HTML dosyaları (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="283"/>
         <source>Export Subsurface XML</source>
         <translation>Subsurface XML dışa aktar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="284"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML dosyaları (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
         <source>Save image depths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="298"/>
         <source>Export HTML files as</source>
         <translation>HTML dosyası olarak dışarı aktar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
         <source>Can&apos;t open file %s</source>
         <translation>%s dosyası açılamıyor</translation>
     </message>
@@ -1581,247 +1757,227 @@ kaldırmak istediğinizden emin misiniz?</translation>
         <translation>Dalış kayıt dosyalarını içe aktar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
-        <source>CSV options</source>
-        <translation>CSV seçenekleri</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
+        <source>Time</source>
+        <translation>Zaman</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="281"/>
-        <source>Pre-configured imports</source>
-        <translation>Önceden yapılandırılmış içe aktarma</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="97"/>
+        <source>Metric</source>
+        <translation>Metrik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="122"/>
-        <source>Depth</source>
-        <translation>Derinlik</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="102"/>
+        <source>Imperial</source>
+        <translation>Emperyal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="142"/>
-        <source>Stopdepth</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="59"/>
+        <source>dd.mm.yyyy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="162"/>
-        <source>Pressure</source>
-        <translation>Basınç</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="176"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="466"/>
-        <source>Time</source>
-        <translation>Zaman</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="183"/>
-        <source>Temp</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="64"/>
+        <source>mm/dd/yyyy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="213"/>
-        <source>NDL</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="69"/>
+        <source>yyyy-mm-dd</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="233"/>
-        <source>TTS</source>
-        <translation>YZ</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="253"/>
-        <source>Cns</source>
-        <translation>Mss</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="58"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="789"/>
-        <source>Field separator</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
+        <source>Drag the tags above to each corresponding column below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="35"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="363"/>
-        <source>Units</source>
-        <translation>Birimler</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="42"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="370"/>
-        <source>Metric</source>
-        <translation>Metrik</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="47"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="375"/>
-        <source>Imperial</source>
-        <translation>Emperyal</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+        <source>Dive #</source>
+        <translation>Dalış #</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="169"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+        <source>Date</source>
+        <translation>Tarih</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="298"/>
-        <source>Manual dives</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+        <source>Duration</source>
+        <translation>Süre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="316"/>
-        <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+        <source>GPS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="319"/>
-        <source>Date format</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+        <source>Tags</source>
+        <translation>Etiketler</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="332"/>
-        <source>dd.mm.yyyy</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+        <source>O₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="337"/>
-        <source>mm/dd/yyyy</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+        <source>He</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="342"/>
-        <source>yyyy-mm-dd</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="78"/>
+        <source>Seconds</source>
+        <translation>Saniye</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="392"/>
-        <source>Dive #</source>
-        <translation>Dalış #</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
+        <source>Minutes</source>
+        <translation>Dakika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="426"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="439"/>
-        <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="88"/>
+        <source>Minutes:seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="429"/>
-        <source>Date</source>
-        <translation>Tarih</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+        <source>Location</source>
+        <translation>Konum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="500"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="513"/>
-        <source>Dive duration in seconds or in min:sec format</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+        <source>Max depth</source>
+        <translation>Azami derinlik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="503"/>
-        <source>Duration</source>
-        <translation>Süre</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+        <source>Tab</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="574"/>
-        <source>GPS</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="591"/>
-        <source>Tags</source>
-        <translation>Etiketler</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="608"/>
-        <source>Cyl size</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+        <source>Sample depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="625"/>
-        <source>Air temp</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+        <source>Sample temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="642"/>
-        <source>Start Pressure</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+        <source>Sample po2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="659"/>
-        <source>Water temp</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+        <source>Sample cns</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="676"/>
-        <source>End Press</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+        <source>Sample ndl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="693"/>
-        <source>O₂</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+        <source>Sample tts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="710"/>
-        <source>He</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+        <source>Sample stopdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="742"/>
-        <source>Choose duration format.</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+        <source>Samples pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="745"/>
-        <source>Duration format</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+        <source>Sample pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="758"/>
-        <source>Seconds</source>
-        <translation>Saniye</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+        <source>Mean depth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="763"/>
-        <source>Minutes</source>
-        <translation>Dakika</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="768"/>
-        <source>Minutes:seconds</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+        <source>Buddy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="540"/>
-        <source>Location</source>
-        <translation>Konum</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+        <source>Notes</source>
+        <translation>Notlar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="409"/>
-        <source>Max depth</source>
-        <translation>Azami derinlik</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+        <source>Weight</source>
+        <translation>Ağırlık</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="386"/>
-        <source>Field configuration</source>
-        <translation>Alan yapılandırma</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="449"/>
-        <source>Mean depth</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+        <source>Start pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="483"/>
-        <source>Buddy</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+        <source>End pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="523"/>
-        <source>Notes</source>
-        <translation>Notlar</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="557"/>
-        <source>Weight</source>
-        <translation>Ağırlık</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1865,42 +2021,42 @@ kaldırmak istediğinizden emin misiniz?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
         <source>unknown</source>
         <translation>bilinmeyen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="691"/>
         <source>Final depth</source>
         <translation>Final derinlik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="693"/>
         <source>Run time</source>
         <translation>Çalışma süresi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="701"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="695"/>
         <source>Duration</source>
         <translation>Süre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="703"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
         <source>Used gas</source>
         <translation>Gaz kullanımı</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="705"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
         <source>CC set point</source>
         <translation>KD set noktası</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1044"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1051"/>
         <source>Discard the plan?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1045"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1052"/>
         <source>You are about to discard your plan.</source>
         <translation type="unfinished"/>
     </message>
@@ -1908,22 +2064,22 @@ kaldırmak istediğinizden emin misiniz?</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="257"/>
         <source>Dive planner points</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="261"/>
         <source>Available gases</source>
         <translation>Mevcut gazlar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="284"/>
         <source>Add dive data point</source>
         <translation>Dalış veri noktası ekle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="304"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="293"/>
         <source>Save new</source>
         <translation type="unfinished"/>
     </message>
@@ -1931,92 +2087,112 @@ kaldırmak istediğinizden emin misiniz?</translation>
 <context>
     <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Depth</source>
         <translation>Derinlik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
         <source>Time</source>
         <translation>Zaman</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
         <source>Pressure</source>
         <translation>Basınç</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>Temperature</source>
         <translation>Sıcaklık</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
         <source>Color</source>
         <translation>Renk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
         <source>Pressure S</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
+        <source>Setpoint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
+        <source>Sensor1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
+        <source>Sensor2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
+        <source>Sensor3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
         <source>Ambient pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
-        <source>Heart Beat</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
+        <source>Heart beat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
-        <source>Gradient Factor</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/>
+        <source>Gradient factor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
-        <source>Mean Depth/s</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
+        <source>Mean depth/s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
         <source>Pressure I</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
         <source>User entered</source>
         <translation>Kullanıcı girdisi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
         <source>Cylinder index</source>
         <translation>Tüp indeksi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
         <source>Ceiling</source>
         <translation>Tavan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
         <source>SAC</source>
         <translation type="unfinished"/>
     </message>
@@ -2067,127 +2243,127 @@ kaldırmak istediğinizden emin misiniz?</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1437"/>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1443"/>
+        <location filename="../qt-ui/models.cpp" line="1489"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1440"/>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1492"/>
         <source>Date</source>
         <translation>Tarih</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1443"/>
-        <location filename="../qt-ui/models.cpp" line="1489"/>
+        <location filename="../qt-ui/models.cpp" line="1449"/>
+        <location filename="../qt-ui/models.cpp" line="1495"/>
         <source>Rating</source>
         <translation>Değerlendirme</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1452"/>
         <source>Depth</source>
         <translation>Derinlik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1458"/>
         <source>Temp</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1461"/>
         <source>Weight</source>
         <translation>Ağırlık</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>ft</source>
         <translation>fit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1458"/>
-        <location filename="../qt-ui/models.cpp" line="1504"/>
+        <location filename="../qt-ui/models.cpp" line="1464"/>
+        <location filename="../qt-ui/models.cpp" line="1510"/>
         <source>Suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1461"/>
-        <location filename="../qt-ui/models.cpp" line="1507"/>
+        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1513"/>
         <source>Cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1464"/>
-        <location filename="../qt-ui/models.cpp" line="1510"/>
+        <location filename="../qt-ui/models.cpp" line="1470"/>
+        <location filename="../qt-ui/models.cpp" line="1516"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1473"/>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1527"/>
         <source>Max CNS</source>
         <translation>Azami MSS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
-        <location filename="../qt-ui/models.cpp" line="1524"/>
+        <location filename="../qt-ui/models.cpp" line="1482"/>
+        <location filename="../qt-ui/models.cpp" line="1530"/>
         <source>Location</source>
         <translation>Konum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1449"/>
-        <location filename="../qt-ui/models.cpp" line="1495"/>
+        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1501"/>
         <source>Duration</source>
         <translation>Süre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1498"/>
+        <location filename="../qt-ui/models.cpp" line="1504"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>lbs</source>
         <translation>libre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1470"/>
-        <location filename="../qt-ui/models.cpp" line="1518"/>
+        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1524"/>
         <source>OTU</source>
         <translation>OZB</translation>
     </message>
@@ -2195,95 +2371,95 @@ kaldırmak istediğinizden emin misiniz?</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="98"/>
         <source>no dives were selected</source>
         <translation>Hiçbir dalış seçilmedi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="117"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>yükleme için zip dosyası oluşturma başarısız oldu: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="143"/>
         <source>cannot create temporary file: %s</source>
         <translation>geçici dosya oluşturulamıyor: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/>
         <source>internal error: %s</source>
         <translation>iç hata: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="169"/>
         <source>internal error</source>
         <translation>iç hata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="629"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="828"/>
         <source>Done</source>
         <translation>Bitti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/>
         <source>Uploading dive list...</source>
         <translation>Dalış listesi yükleniyor ...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="692"/>
         <source>Downloading dive list...</source>
         <translation>Dalış listesi indiriliyor ...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="741"/>
         <source>Downloading %1 dives...</source>
         <translation>%1 dalış indiriliyor...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="785"/>
         <source>Download finished - %1</source>
         <translation>İndirme bitti- %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="802"/>
         <source>Corrupted download</source>
         <translation>İndirme bozuk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Arşiv açılamadı:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
         <source>Upload failed</source>
         <translation>Yükleme başarısız oldu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/>
         <source>Upload successful</source>
         <translation>Yükleme başarılı</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
         <source>Login failed</source>
         <translation>Giriş başarısız</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
         <source>Cannot parse response</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
         <source>Error: %1</source>
         <translation>Hata: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="829"/>
         <source>Upload finished</source>
         <translation>Yükleme bitti</translation>
     </message>
@@ -2291,54 +2467,52 @@ kaldırmak istediğinizden emin misiniz?</translation>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
-        <source>OK</source>
-        <translation>TAMAM</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="169"/>
         <source>Error</source>
         <translation>Hata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="400"/>
         <source>Retry</source>
         <translation>Yeniden dene</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="264"/>
         <source>Find Uemis dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Log files (*.log)</source>
         <translation>Kayıt dosyaları (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="362"/>
         <source>Warning</source>
         <translation>Uyarı</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="363"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="374"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="375"/>
         <source>Dump files (*.bin)</source>
         <translation type="unfinished"/>
     </message>
@@ -2346,7 +2520,7 @@ kaldırmak istediğinizden emin misiniz?</translation>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="101"/>
         <source>Vendor</source>
         <translation>Satıcı</translation>
     </message>
@@ -2356,54 +2530,74 @@ kaldırmak istediğinizden emin misiniz?</translation>
         <translation>Dalış bilgisayarından indir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="31"/>
         <source>Device or mount point</source>
         <translation>Cihaz veya bağlama noktası</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="111"/>
         <source>Dive computer</source>
         <translation>Dalış bilgisayarı</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="132"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="45"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="80"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="94"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="52"/>
         <source>Force download of all dives</source>
         <translation>Tüm dalışları indirmeyi zorla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
         <source>Always prefer downloaded dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
         <source>OK</source>
         <translation>TAMAM</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="189"/>
         <source>Cancel</source>
         <translation>İptal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/>
+        <source>Downloaded Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
+        <source>Select all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
+        <source>Unselect all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
         <source>Save libdivecomputer logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="87"/>
         <source>Save libdivecomputer dumpfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
         <source>Download into new trip</source>
         <translation type="unfinished"/>
     </message>
@@ -2411,12 +2605,12 @@ kaldırmak istediğinizden emin misiniz?</translation>
 <context>
     <name>ExtraDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Value</source>
         <translation type="unfinished"/>
     </message>
@@ -2430,21 +2624,21 @@ kaldırmak istediğinizden emin misiniz?</translation>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="245"/>
-        <source>Your dive profile was updated to facebook.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
-        <source>Photo Upload Failed</source>
+        <source>Your dive profile was updated to Facebook.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="250"/>
-        <source>Your dive profile was not updated to facebook, 
+        <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+        <source>Photo Upload Failed</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>FilterWidget</name>
@@ -2485,17 +2679,17 @@ kaldırmak istediğinizden emin misiniz?</translation>
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1544"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1621"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1624"/>
         <source>Firmware update failed!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1550"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1627"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -2503,7 +2697,7 @@ kaldırmak istediğinizden emin misiniz?</translation>
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="128"/>
+        <location filename="../qt-ui/globe.cpp" line="119"/>
         <source>Edit selected dive locations</source>
         <translation>Seçili dalış konumlarını düzenle</translation>
     </message>
@@ -2511,7 +2705,7 @@ kaldırmak istediğinizden emin misiniz?</translation>
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="566"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="549"/>
         <source>Location: </source>
         <translation type="unfinished"/>
     </message>
@@ -2519,7 +2713,7 @@ kaldırmak istediğinizden emin misiniz?</translation>
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="286"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="283"/>
         <source>No location set</source>
         <translation type="unfinished"/>
     </message>
@@ -2527,347 +2721,352 @@ kaldırmak istediğinizden emin misiniz?</translation>
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="133"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
+        <location filename="../qt-ui/maintab.cpp" line="497"/>
         <source>Location</source>
         <translation>Konum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="67"/>
         <source>Coordinates</source>
         <translation>Koordinatlar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="169"/>
         <source>Divemaster</source>
         <translation>Divemaster(Dalış lideri)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="154"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Buddy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="222"/>
+        <location filename="../qt-ui/maintab.ui" line="277"/>
         <source>Tags</source>
         <translation>Etiketler</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="186"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
         <source>Rating</source>
         <translation>Değerlendirme</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="221"/>
         <source>Visibility</source>
         <translation>Görünütlük</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="230"/>
         <source>Suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="465"/>
+        <location filename="../qt-ui/maintab.cpp" line="470"/>
         <source>Dive notes</source>
         <translation>Dalış notları</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
-        <location filename="../qt-ui/maintab.ui" line="648"/>
-        <location filename="../qt-ui/maintab.cpp" line="277"/>
+        <location filename="../qt-ui/maintab.ui" line="74"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="102"/>
+        <location filename="../qt-ui/maintab.ui" line="677"/>
+        <location filename="../qt-ui/maintab.cpp" line="279"/>
         <source>Air temp.</source>
         <translation>Hava sıcaklığı.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <location filename="../qt-ui/maintab.ui" line="667"/>
-        <location filename="../qt-ui/maintab.cpp" line="278"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.ui" line="696"/>
+        <location filename="../qt-ui/maintab.cpp" line="280"/>
         <source>Water temp.</source>
         <translation>Su sıcaklığı.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="229"/>
-        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.ui" line="284"/>
+        <location filename="../qt-ui/maintab.cpp" line="498"/>
         <source>Notes</source>
         <translation>Notlar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="369"/>
+        <location filename="../qt-ui/maintab.ui" line="398"/>
         <source>Equipment</source>
         <translation>Ekipman</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="496"/>
+        <location filename="../qt-ui/maintab.ui" line="525"/>
         <source>Gases used</source>
         <translation>Kullanılan gazlar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="515"/>
+        <location filename="../qt-ui/maintab.ui" line="544"/>
         <source>Gas consumed</source>
         <translation>Tüketilen gaz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="553"/>
+        <location filename="../qt-ui/maintab.ui" line="582"/>
         <source>CNS</source>
         <translation>MSS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="591"/>
+        <location filename="../qt-ui/maintab.ui" line="620"/>
         <source>Max. depth</source>
         <translation>Azami derinlik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="629"/>
+        <location filename="../qt-ui/maintab.ui" line="658"/>
         <source>Air pressure</source>
         <translation>Hava basıncı</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="686"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>Dive time</source>
         <translation>Dalış süresi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="845"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
         <source>Total time</source>
         <translation>Toplam süre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="903"/>
+        <location filename="../qt-ui/maintab.ui" line="932"/>
         <source>Gas consumption</source>
         <translation>Gaz tüketimi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="962"/>
+        <location filename="../qt-ui/maintab.ui" line="991"/>
         <source>Extra data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="968"/>
+        <location filename="../qt-ui/maintab.ui" line="997"/>
         <source>Additional data from dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="54"/>
-        <location filename="../qt-ui/maintab.ui" line="458"/>
+        <location filename="../qt-ui/maintab.ui" line="83"/>
+        <location filename="../qt-ui/maintab.ui" line="487"/>
         <source>Date</source>
         <translation>Tarih</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="61"/>
+        <location filename="../qt-ui/maintab.ui" line="90"/>
         <source>Time</source>
         <translation>Zaman</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="425"/>
+        <location filename="../qt-ui/maintab.ui" line="454"/>
         <source>Dive info</source>
         <translation>Dalış bilgisi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="477"/>
+        <location filename="../qt-ui/maintab.ui" line="506"/>
         <source>Interval</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="534"/>
-        <location filename="../qt-ui/maintab.ui" line="799"/>
+        <location filename="../qt-ui/maintab.ui" line="563"/>
+        <location filename="../qt-ui/maintab.ui" line="828"/>
         <source>SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="610"/>
+        <location filename="../qt-ui/maintab.ui" line="639"/>
         <source>Avg. depth</source>
         <translation>Ort. derinlik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="572"/>
+        <location filename="../qt-ui/maintab.ui" line="601"/>
         <source>OTU</source>
         <translation>OZB</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="734"/>
         <source>Salinity</source>
         <translation>Tuzluluk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="742"/>
+        <location filename="../qt-ui/maintab.ui" line="771"/>
         <source>Stats</source>
         <translation>İstatistikler</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="775"/>
+        <location filename="../qt-ui/maintab.ui" line="804"/>
         <source>Depth</source>
         <translation>Derinlik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="787"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Temperature</source>
         <translation>Sıcaklık</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="813"/>
+        <location filename="../qt-ui/maintab.ui" line="842"/>
         <source>Duration</source>
         <translation>Süre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="864"/>
+        <location filename="../qt-ui/maintab.ui" line="893"/>
         <source>Dives</source>
         <translation>Dalışlar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="948"/>
+        <location filename="../qt-ui/maintab.ui" line="977"/>
         <source>Photos</source>
         <translation>Fotoğraflar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="95"/>
+        <location filename="../qt-ui/maintab.cpp" line="87"/>
         <source>Cylinders</source>
         <translation>Tüpler</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="99"/>
+        <location filename="../qt-ui/maintab.cpp" line="91"/>
         <source>Weights</source>
         <translation>Ağırlıklar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="55"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Apply changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="59"/>
+        <location filename="../qt-ui/maintab.cpp" line="50"/>
         <source>Discard changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="96"/>
+        <location filename="../qt-ui/maintab.cpp" line="88"/>
         <source>Add cylinder</source>
         <translation>Tüp ekle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="100"/>
+        <location filename="../qt-ui/maintab.cpp" line="92"/>
         <source>Add weight system</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="274"/>
+        <location filename="../qt-ui/maintab.cpp" line="276"/>
         <source>Air temp. [%1]</source>
         <translation>Hava sıcaklığı. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="275"/>
+        <location filename="../qt-ui/maintab.cpp" line="277"/>
         <source>Water temp. [%1]</source>
         <translation>Su sıcaklığı. [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="312"/>
+        <location filename="../qt-ui/maintab.cpp" line="314"/>
         <source>This trip is being edited.</source>
         <translation>Bu gezi düzenleniyor.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="320"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Multiple dives are being edited.</source>
         <translation>Çoklu dalış düzenleniyor.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.cpp" line="324"/>
         <source>This dive is being edited.</source>
         <translation>Bu dalış düzenleniyor.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="436"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
+        <location filename="../qt-ui/maintab.cpp" line="465"/>
         <source>Trip notes</source>
         <translation>Gezi notları</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="458"/>
+        <location filename="../qt-ui/maintab.cpp" line="463"/>
         <source>Trip location</source>
         <translation>Gezi konumu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="526"/>
-        <location filename="../qt-ui/maintab.cpp" line="558"/>
-        <location filename="../qt-ui/maintab.cpp" line="562"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
         <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="574"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="555"/>
+        <location filename="../qt-ui/maintab.cpp" line="563"/>
         <source>Deepest dive</source>
         <translation>Derin dalış</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="556"/>
+        <location filename="../qt-ui/maintab.cpp" line="564"/>
         <source>Shallowest dive</source>
         <translation>Sığ dalış</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="569"/>
+        <location filename="../qt-ui/maintab.cpp" line="577"/>
         <source>Highest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="578"/>
         <source>Lowest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="571"/>
+        <location filename="../qt-ui/maintab.cpp" line="579"/>
         <source>Average total SAC of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="582"/>
+        <location filename="../qt-ui/maintab.cpp" line="590"/>
         <source>Highest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="583"/>
+        <location filename="../qt-ui/maintab.cpp" line="591"/>
         <source>Lowest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="584"/>
+        <location filename="../qt-ui/maintab.cpp" line="592"/>
         <source>Average temperature of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="594"/>
+        <location filename="../qt-ui/maintab.cpp" line="602"/>
         <source>Longest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="595"/>
+        <location filename="../qt-ui/maintab.cpp" line="603"/>
         <source>Shortest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="596"/>
+        <location filename="../qt-ui/maintab.cpp" line="604"/>
         <source>Average length of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="620"/>
+        <location filename="../qt-ui/maintab.cpp" line="628"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="624"/>
+        <location filename="../qt-ui/maintab.cpp" line="632"/>
         <source> and </source>
         <translation>ve</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="911"/>
+        <location filename="../qt-ui/maintab.cpp" line="925"/>
         <source>Discard the changes?</source>
         <translation>Değişiklikleri silinsin mi ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="912"/>
+        <location filename="../qt-ui/maintab.cpp" line="926"/>
         <source>You are about to discard your changes.</source>
         <translation type="unfinished"/>
     </message>
@@ -3010,7 +3209,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="296"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="232"/>
         <source>Open</source>
         <translation>Aç</translation>
     </message>
@@ -3370,90 +3569,90 @@ p, li { white-space: pre-wrap; }
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="252"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="229"/>
         <source>Open file</source>
         <translation>Dosya aç</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="256"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="233"/>
         <source>Cancel</source>
         <translation>İptal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="332"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="309"/>
         <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="444"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
         <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="491"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
         <source>Print runtime table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="834"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="811"/>
         <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="836"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="813"/>
         <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="841"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="818"/>
         <source>Save changes?</source>
         <translation>Değişiklikler kaydedilsin mi ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1196"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1173"/>
         <source>Save file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1337"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1314"/>
         <source>Open dive log file</source>
         <translation>Dalış kayıt dosyasını aç</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="819"/>
         <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="300"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="444"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="277"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Warning</source>
         <translation>Uyarı</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1180"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1157"/>
         <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="625"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="602"/>
         <source>Yearly statistics</source>
         <translation>Yıllık istatistikler</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1197"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1174"/>
         <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="1338"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1315"/>
         <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"/>
     </message>
@@ -3461,7 +3660,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="651"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="634"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation type="unfinished"/>
     </message>
@@ -3469,39 +3668,39 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="239"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="243"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="244"/>
         <source>Not now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="245"/>
         <source>Update firmware</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
         <source>Firmware upgrade notice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
         <source>Save the downloaded firmware as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
         <source>HEX files (*.hex)</source>
         <translation type="unfinished"/>
     </message>
@@ -3509,54 +3708,69 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Open circuit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>ft/min</source>
         <translation>fit/dak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="481"/>
         <source>Last stop at 20ft</source>
         <translation>20 fit son durak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="482"/>
         <source>50% avg. depth to 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="489"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
         <source>20ft to surface</source>
         <translation>Yüzeye 20 fit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="485"/>
         <source>m/min</source>
         <translation>m/dak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
         <source>Last stop at 6m</source>
         <translation>6m son durak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
         <source>50% avg. depth to 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="494"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
         <source>6m to surface</source>
         <translation>yüzeye 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="497"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="498"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
         <source>cuft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="506"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="507"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="500"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="501"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
@@ -3675,6 +3889,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="816"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -3709,57 +3924,87 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="795"/>
+        <source>CCR: Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="809"/>
+        <source>Default CCR set-point for dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="832"/>
+        <source>pSCR O₂ metabolism rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="839"/>
+        <source>pSCR ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="846"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="859"/>
+        <source>1:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="875"/>
         <source>System default</source>
         <translation>Varsayılan sistem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="843"/>
+        <location filename="../qt-ui/preferences.ui" line="914"/>
         <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="849"/>
+        <location filename="../qt-ui/preferences.ui" line="920"/>
         <source>Proxy type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="862"/>
+        <location filename="../qt-ui/preferences.ui" line="933"/>
         <source>Host</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="888"/>
+        <location filename="../qt-ui/preferences.ui" line="959"/>
         <source>Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="914"/>
+        <location filename="../qt-ui/preferences.ui" line="985"/>
         <source>Requires authentication</source>
         <translation>Kimlik doğrulaması gerektirir</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="934"/>
+        <location filename="../qt-ui/preferences.ui" line="1005"/>
         <source>Username</source>
         <translation>Kullanıcı adı</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="957"/>
+        <location filename="../qt-ui/preferences.ui" line="1028"/>
         <source>Password</source>
         <translation>Parola</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="985"/>
-        <source>about:blank</source>
+        <location filename="../qt-ui/preferences.ui" line="1079"/>
+        <source>Disconnect from Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1011"/>
-        <source>Disconnect from facebook</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="824"/>
+        <location filename="../qt-ui/preferences.ui" line="895"/>
         <source>Filter</source>
         <translation>Filtre</translation>
     </message>
@@ -3914,52 +4159,52 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>EFYüksek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="28"/>
+        <location filename="../qt-ui/preferences.cpp" line="44"/>
         <source>No proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="29"/>
+        <location filename="../qt-ui/preferences.cpp" line="45"/>
         <source>System proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="30"/>
+        <location filename="../qt-ui/preferences.cpp" line="46"/>
         <source>HTTP proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="31"/>
+        <location filename="../qt-ui/preferences.cpp" line="47"/>
         <source>SOCKS proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="291"/>
+        <location filename="../qt-ui/preferences.cpp" line="324"/>
         <source>Restart required</source>
         <translation>Yeniden başlatma gerekli</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="292"/>
+        <location filename="../qt-ui/preferences.cpp" line="325"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>Subsurface yeni bir dil yüklemek için yeniden başlatmanız gerekir.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="456"/>
+        <location filename="../qt-ui/preferences.cpp" line="494"/>
         <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML dosyaları (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Open default log file</source>
         <translation>Varsayılan kayıt dosyasını aç</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="455"/>
+        <location filename="../qt-ui/preferences.cpp" line="493"/>
         <source>Warning</source>
         <translation>Uyarı</translation>
     </message>
@@ -3967,17 +4212,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="91"/>
+        <location filename="../qt-ui/printdialog.cpp" line="85"/>
         <source>&amp;Preview</source>
         <translation>&amp;Önizleme</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="88"/>
+        <location filename="../qt-ui/printdialog.cpp" line="82"/>
         <source>P&amp;rint</source>
         <translation>&amp;Yazdır</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="103"/>
+        <location filename="../qt-ui/printdialog.cpp" line="97"/>
         <source>Print</source>
         <translation>Yazdır</translation>
     </message>
@@ -3985,42 +4230,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="20"/>
         <source>Dive#</source>
         <translation>Dalış#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="21"/>
         <source>Date</source>
         <translation>Tarih</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="22"/>
         <source>Depth</source>
         <translation>Derinlik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="23"/>
         <source>Duration</source>
         <translation>Süre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Master</source>
         <translation>Divemaster(Dalış lideri)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Buddy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="34"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Location</source>
         <translation>Konum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <location filename="../qt-ui/printlayout.cpp" line="63"/>
         <source>Subsurface cannot find a usable printer on this system!</source>
         <translation type="unfinished"/>
     </message>
@@ -4086,72 +4331,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2095"/>
+        <location filename="../qt-ui/models.cpp" line="2101"/>
         <source>unknown</source>
         <translation>bilinmeyen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2100"/>
+        <location filename="../qt-ui/models.cpp" line="2106"/>
         <source>Dive #%1 - %2</source>
         <translation>Dalış #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2103"/>
+        <location filename="../qt-ui/models.cpp" line="2109"/>
         <source>Max depth: %1 %2</source>
         <translation>Azami derinlik: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2110"/>
+        <location filename="../qt-ui/models.cpp" line="2116"/>
         <source>Duration: %1 min</source>
         <translation>Süre: %1 dak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2115"/>
+        <location filename="../qt-ui/models.cpp" line="2121"/>
         <source>Gas used:</source>
         <translation>Gaz kullanımı:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2117"/>
+        <location filename="../qt-ui/models.cpp" line="2123"/>
         <source>Tags:</source>
         <translation>Etiketler:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2119"/>
+        <location filename="../qt-ui/models.cpp" line="2125"/>
         <source>SAC:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2121"/>
+        <location filename="../qt-ui/models.cpp" line="2127"/>
         <source>Weights:</source>
         <translation>Ağırlıklar:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2126"/>
+        <location filename="../qt-ui/models.cpp" line="2132"/>
         <source>Notes:</source>
         <translation>Notlar:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2133"/>
+        <location filename="../qt-ui/models.cpp" line="2139"/>
         <source>Divemaster:</source>
         <translation>Divemaster(Dalış lideri):</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2135"/>
+        <location filename="../qt-ui/models.cpp" line="2141"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2137"/>
+        <location filename="../qt-ui/models.cpp" line="2143"/>
         <source>Suit:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2139"/>
+        <location filename="../qt-ui/models.cpp" line="2145"/>
         <source>Viz:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2141"/>
+        <location filename="../qt-ui/models.cpp" line="2147"/>
         <source>Rating:</source>
         <translation>Değerlendirme:</translation>
     </message>
@@ -4159,103 +4404,108 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="628"/>
         <source> (#%1 of %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="630"/>
+        <source>Unknown dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="647"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1168"/>
         <source>Make first divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Delete this divecomputer</source>
         <translation>Dalış bilgisayarı sil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1184"/>
         <source>Add gas change</source>
         <translation>Gaz değişimi ekle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1187"/>
         <source> (Tank %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1195"/>
         <source>Add set-point change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1197"/>
         <source>Add bookmark</source>
         <translation>Yerimi ekle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
         <source>Remove event</source>
         <translation>OLay kaldır</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1206"/>
         <source>Hide similar events</source>
         <translation>Benzer olayları gizle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1213"/>
         <source>Edit name</source>
         <translation>İsmi düzenle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1242"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1249"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1264"/>
         <source>Unhide all events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide events</source>
         <translation>Olayları gizle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide all %1 events?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1333"/>
         <source>Remove the selected event?</source>
         <translation>Seçili olayları kaldırılsın mı ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1334"/>
         <source>%1 @ %2:%3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1424"/>
         <source>Edit name of bookmark</source>
         <translation>Yeriminde ismi düzenle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
         <source>Custom name:</source>
         <translation>Özel isim:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1430"/>
         <source>Name is too long!</source>
         <translation>İsim çok uzun!</translation>
     </message>
@@ -4263,102 +4513,102 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>AIR</source>
         <translation>HAVA</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>OXYGEN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="208"/>
         <source>Remove this point</source>
         <translation>Bu noktayı kaldır</translation>
     </message>
     <message>
-        <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="57"/>
         <source>Close</source>
         <translation>Kapat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="42"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="25"/>
         <source>Average</source>
         <translation>Ortalama</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="45"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="28"/>
         <source>Minimum</source>
         <translation>Asgari</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="48"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="31"/>
         <source>Maximum</source>
         <translation>Azami</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="297"/>
+        <location filename="../qt-ui/globe.cpp" line="296"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="525"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="526"/>
         <source>lbs</source>
         <translation>libre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="550"/>
         <source>ft</source>
         <translation>fit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="551"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="570"/>
+        <location filename="../qt-ui/models.cpp" line="574"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="571"/>
+        <location filename="../qt-ui/models.cpp" line="575"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="595"/>
+        <location filename="../qt-ui/models.cpp" line="599"/>
         <source>l</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="596"/>
+        <location filename="../qt-ui/models.cpp" line="600"/>
         <source>cuft</source>
         <translation>fitküp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="513"/>
         <source>Invalid response from server</source>
         <translation>Sunucudan geçersiz yanıt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="567"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation type="unfinished"/>
     </message>
@@ -4366,12 +4616,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1450"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1518"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1442"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -4385,12 +4635,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
-        <location filename="../qt-ui/simplewidgets.cpp" line="151"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="134"/>
         <source>New starting number</source>
         <translation>Yeni başlama numarası</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="149"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="132"/>
         <source>New number</source>
         <translation>Yeni numara</translation>
     </message>
@@ -4398,12 +4648,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1575"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1653"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1579"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1657"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -4482,12 +4732,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="276"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="259"/>
         <source>Open image file</source>
         <translation>Görüntü dosyası aç</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="278"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="261"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Görüntü dosyaları (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -4540,7 +4790,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <name>SocialNetworkDialog</name>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="282"/>
-        <source>Dive Date: %1 
+        <source>Dive date: %1 
 </source>
         <translation type="unfinished"/>
     </message>
@@ -4564,7 +4814,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="290"/>
-        <source>Dive Location: %1 
+        <source>Dive location: %1 
 </source>
         <translation type="unfinished"/>
     </message>
@@ -4681,47 +4931,47 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="329"/>
         <source>Webservice</source>
         <translation>Webservisi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="393"/>
         <source>Connecting...</source>
         <translation>Bağlanıyor...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
         <source>Download finished</source>
         <translation>İndirme bitti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Download error: %1</source>
         <translation>İndirme hatası: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="436"/>
         <source>Connection error: </source>
         <translation>Bağlantı hatası: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
         <source>Download successful</source>
         <translation>İndirme başarılı</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="439"/>
         <source>Invalid user identifier!</source>
         <translation>Geçersiz kullanıcı tanımlayıcı!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="312"/>
         <source>Enter User ID and click Download</source>
         <translation>Kullanıcı kimliğini gir ve indir tıkla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="442"/>
         <source>Cannot parse response!</source>
         <translation>Yanıt ayrıştırılamaz!</translation>
     </message>
@@ -4729,7 +4979,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="592"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="575"/>
         <source>Suits: </source>
         <translation type="unfinished"/>
     </message>
@@ -4737,7 +4987,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="119"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="116"/>
         <source>No suit set</source>
         <translation type="unfinished"/>
     </message>
@@ -4754,7 +5004,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="513"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="496"/>
         <source>Tags: </source>
         <translation type="unfinished"/>
     </message>
@@ -4762,7 +5012,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="144"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="141"/>
         <source>Empty tags</source>
         <translation type="unfinished"/>
     </message>
@@ -4770,17 +5020,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>Description</source>
         <translation>Tanımlama</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -4788,7 +5038,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="141"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="131"/>
         <source>Information</source>
         <translation>Bilgilendirme</translation>
     </message>
@@ -4796,7 +5046,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1090"/>
+        <location filename="../qt-ui/models.cpp" line="1094"/>
         <source> (%1 shown)</source>
         <translation type="unfinished"/>
     </message>
@@ -4804,72 +5054,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="64"/>
         <source>Check for updates.</source>
         <translation>Güncellemeler için denetle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="66"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface güncellemeleri kontrol edemedi.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="70"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="72"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
         <source>Please check your internet connection.</source>
         <translation>Lütfen internet bağlantınızı kontrol edin.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="85"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="84"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="88"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="95"/>
         <source>A new version of Subsurface is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="97"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
         <source>Latest version is %1, please check with your OS vendor for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="103"/>
         <source>Newest release version is </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="105"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
         <source>The server returned the following information:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="121"/>
         <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
         <source>Decline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="124"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
         <source>Accept</source>
         <translation>Uygula</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="126"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="125"/>
         <source>Automatic check for updates</source>
         <translation type="unfinished"/>
     </message>
@@ -4877,13 +5127,13 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UserManual</name>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="55"/>
+        <location filename="../qt-ui/usermanual.cpp" line="54"/>
         <source>User Manual</source>
         <translation>Kullanıcı Rehberi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="72"/>
-        <location filename="../qt-ui/usermanual.cpp" line="78"/>
+        <location filename="../qt-ui/usermanual.cpp" line="71"/>
+        <location filename="../qt-ui/usermanual.cpp" line="77"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Subsurface kılavuzu bulunamadı</translation>
     </message>
@@ -4961,84 +5211,84 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
         <source>
 Operating System: %1</source>
         <translation>
 İşletim Sistemi: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 İşlemci Mimarisi: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 Language: %1</source>
         <translation>
 Lisan: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="93"/>
         <source>Should we ask you later?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Don&apos;t ask me again</source>
         <translation>Bana tekrar sorma</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Ask later</source>
         <translation>Daha sonra sor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
         <source>Submit user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask again?</source>
         <translation>Tekrar soruyorum ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="17"/>
         <source>Send</source>
         <translation>Gönder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="121"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>Please check your internet connection.</source>
         <translation>Lütfen internet bağlantınızı kontrol edin.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="131"/>
         <source>Survey successfully submitted.</source>
         <translation>Anket başarıyla gönderildi.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="136"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation>Güncellemeleri kontrol etmeye çalışırken bir hata oluştu.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -5046,12 +5296,12 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>Description</source>
         <translation>Tanımlama</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -5099,12 +5349,12 @@ OS CPU Architecture: %1</source>
         <translation>Yükle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="247"/>
         <source>Operation timed out</source>
         <translation>İşlem zaman aşımı</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="268"/>
         <source>Transferring data...</source>
         <translation type="unfinished"/>
     </message>
@@ -5112,17 +5362,17 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Type</source>
         <translation>Tür</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Weight</source>
         <translation>Ağırlık</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="496"/>
+        <location filename="../qt-ui/models.cpp" line="500"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Ağırlık sistemi buraya tıklayarak kaldırılır.</translation>
     </message>
@@ -5130,19 +5380,19 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1479"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1487"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1497"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1555"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1566"/>
         <source>Failed!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1506"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1576"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1580"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -5150,78 +5400,78 @@ OS CPU Architecture: %1</source>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1841"/>
+        <location filename="../qt-ui/models.cpp" line="1847"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Yıl 
  &gt; Ay / Seyahat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1844"/>
+        <location filename="../qt-ui/models.cpp" line="1850"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1847"/>
+        <location filename="../qt-ui/models.cpp" line="1853"/>
         <source>Duration 
  Total</source>
         <translation>Süre 
  Toplam</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1850"/>
+        <location filename="../qt-ui/models.cpp" line="1856"/>
         <source>
 Average</source>
         <translation>
 Ortalama</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1853"/>
+        <location filename="../qt-ui/models.cpp" line="1859"/>
         <source>
 Shortest</source>
         <translation>
 Kısa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1856"/>
+        <location filename="../qt-ui/models.cpp" line="1862"/>
         <source>
 Longest</source>
         <translation>
 Uzun</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1859"/>
+        <location filename="../qt-ui/models.cpp" line="1865"/>
         <source>Depth (%1)
  Average</source>
         <translation>Derinlik (%1)
  Ortalama</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1862"/>
-        <location filename="../qt-ui/models.cpp" line="1871"/>
-        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>
 Minimum</source>
         <translation>
 Asgari</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1865"/>
-        <location filename="../qt-ui/models.cpp" line="1874"/>
-        <location filename="../qt-ui/models.cpp" line="1883"/>
+        <location filename="../qt-ui/models.cpp" line="1871"/>
+        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>
 Maximum</source>
         <translation>
 Azami</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1874"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1883"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Sıcaklık (%1)
@@ -5302,40 +5552,40 @@ Ortalama</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1508"/>
+        <location filename="../dive.c" line="1530"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) veya (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="464"/>
+        <location filename="../divelist.c" line="467"/>
         <location filename="../equipment.c" line="81"/>
-        <location filename="../planner.c" line="1060"/>
-        <location filename="../planner.c" line="1063"/>
+        <location filename="../planner.c" line="1081"/>
+        <location filename="../planner.c" line="1084"/>
         <source>air</source>
         <translation>hava</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="192"/>
+        <location filename="../equipment.c" line="194"/>
         <source>integrated</source>
         <translation>entegre</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="193"/>
+        <location filename="../equipment.c" line="195"/>
         <source>belt</source>
         <translation>kemer</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="194"/>
+        <location filename="../equipment.c" line="196"/>
         <source>ankle</source>
         <translation>ayak bileği</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="195"/>
+        <location filename="../equipment.c" line="197"/>
         <source>backplate weight</source>
         <translation>arka plaka ağırlığı</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="196"/>
+        <location filename="../equipment.c" line="198"/>
         <source>clip-on</source>
         <translation>klipsli</translation>
     </message>
@@ -5343,7 +5593,7 @@ Ortalama</translation>
         <location filename="../file.c" line="112"/>
         <location filename="../file.c" line="434"/>
         <location filename="../file.c" line="506"/>
-        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="925"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>&apos;%s&apos; okunamadı</translation>
     </message>
@@ -5400,9 +5650,9 @@ Ortalama</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../file.c" line="869"/>
-        <location filename="../file.c" line="909"/>
-        <location filename="../file.c" line="1007"/>
+        <location filename="../file.c" line="870"/>
+        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="1016"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation type="unfinished"/>
     </message>
@@ -5573,27 +5823,27 @@ Ortalama</translation>
         <translation>geçersiz olay numarası</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="421"/>
+        <location filename="../libdivecomputer.c" line="419"/>
         <source>Unable to create parser for %s %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="427"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Error registering the data</source>
         <translation>Veri kaydedilirken hata</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="433"/>
         <source>Error parsing the datetime</source>
         <translation>Tarih saat ayrıştırma hatası</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Dive %d: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="455"/>
+        <location filename="../libdivecomputer.c" line="454"/>
         <source>Error parsing the divetime</source>
         <translation>Dalış zamanı ayrıştırma hatası</translation>
     </message>
@@ -5603,155 +5853,155 @@ Ortalama</translation>
         <translation>Azami derinlik ayrıştırma hatası</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="482"/>
+        <location filename="../libdivecomputer.c" line="483"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="501"/>
+        <location filename="../libdivecomputer.c" line="503"/>
         <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="513"/>
+        <location filename="../libdivecomputer.c" line="515"/>
         <source>Error obtaining water salinity</source>
         <translation>Su tuzluluğu edinme hatası</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="521"/>
+        <location filename="../libdivecomputer.c" line="524"/>
         <source>Error obtaining surface pressure</source>
         <translation>Yüzey basıncı edinme hatası</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="545"/>
+        <location filename="../libdivecomputer.c" line="549"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="562"/>
+        <location filename="../libdivecomputer.c" line="569"/>
         <source>Error parsing the gas mix</source>
         <translation>Gaz karışımı ayrıştırma hatası</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="569"/>
+        <location filename="../libdivecomputer.c" line="576"/>
         <source>Error parsing the samples</source>
         <translation>Örnekleri ayrıştırma hatası</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="706"/>
+        <location filename="../libdivecomputer.c" line="713"/>
         <source>Event: waiting for user action</source>
         <translation>Olay: kullanıcı eylemi bekleniyor</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="714"/>
+        <location filename="../libdivecomputer.c" line="721"/>
         <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="778"/>
+        <location filename="../libdivecomputer.c" line="785"/>
         <source>Error registering the event handler.</source>
         <translation>Olay işleyicisi kayıt hatası.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="783"/>
+        <location filename="../libdivecomputer.c" line="790"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="804"/>
+        <location filename="../libdivecomputer.c" line="811"/>
         <source>Dive data import error</source>
         <translation>Dalış verisi içe aktarma hatası</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="843"/>
+        <location filename="../libdivecomputer.c" line="850"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="850"/>
+        <location filename="../libdivecomputer.c" line="857"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="858"/>
+        <location filename="../libdivecomputer.c" line="865"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="506"/>
+        <location filename="../parse-xml.c" line="516"/>
         <source>Strange percentage reading %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1760"/>
+        <location filename="../parse-xml.c" line="1770"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1989"/>
-        <location filename="../parse-xml.c" line="2137"/>
+        <location filename="../parse-xml.c" line="1999"/>
+        <location filename="../parse-xml.c" line="2147"/>
         <source>Database query dm4_events failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1996"/>
-        <location filename="../parse-xml.c" line="2144"/>
+        <location filename="../parse-xml.c" line="2006"/>
+        <location filename="../parse-xml.c" line="2154"/>
         <source>Database query dm4_tags failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2318"/>
+        <location filename="../parse-xml.c" line="2328"/>
         <source>Database query shearwater_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2325"/>
+        <location filename="../parse-xml.c" line="2335"/>
         <source>Database query shearwater_changes failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2332"/>
+        <location filename="../parse-xml.c" line="2342"/>
         <source>Database query shearwater_profile_sample failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2451"/>
+        <location filename="../parse-xml.c" line="2461"/>
         <source>Database query cobalt_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2458"/>
+        <location filename="../parse-xml.c" line="2468"/>
         <source>Database query cobalt_buddies failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2465"/>
+        <location filename="../parse-xml.c" line="2475"/>
         <source>Database query cobalt_visibility failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2472"/>
+        <location filename="../parse-xml.c" line="2482"/>
         <source>Database query cobalt_location failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2479"/>
+        <location filename="../parse-xml.c" line="2489"/>
         <source>Database query cobalt_location (site) failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2486"/>
+        <location filename="../parse-xml.c" line="2496"/>
         <source>Database query cobalt_profile_sample failed.
 </source>
         <translation type="unfinished"/>
@@ -5764,17 +6014,17 @@ Ortalama</translation>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2168"/>
-        <location filename="../parse-xml.c" line="2189"/>
-        <location filename="../parse-xml.c" line="2508"/>
-        <location filename="../parse-xml.c" line="2527"/>
+        <location filename="../parse-xml.c" line="2178"/>
+        <location filename="../parse-xml.c" line="2199"/>
+        <location filename="../parse-xml.c" line="2518"/>
+        <location filename="../parse-xml.c" line="2537"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Veritabanı sorgusu başarısız &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2848"/>
+        <location filename="../parse-xml.c" line="2909"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation type="unfinished"/>
     </message>
@@ -5784,227 +6034,233 @@ Ortalama</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="820"/>
+        <location filename="../planner.c" line="841"/>
         <source>Can&apos;t find gas %s</source>
         <translation>%s gaz bulunamıyor</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="356"/>
+        <location filename="../planner.c" line="363"/>
         <source>Too many gas mixes</source>
         <translation>Çok fazla gaz karışımı</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="540"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="548"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="544"/>
+        <location filename="../planner.c" line="551"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface dalış planı</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="548"/>
+        <location filename="../planner.c" line="555"/>
         <source>depth</source>
         <translation>derinlik</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="558"/>
         <source>runtime</source>
         <translation>çalışma süresi</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="554"/>
+        <location filename="../planner.c" line="561"/>
         <source>duration</source>
         <translation>süre</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="557"/>
+        <location filename="../planner.c" line="564"/>
         <source>gas</source>
         <translation>gaz</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="594"/>
+        <location filename="../planner.c" line="601"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="602"/>
+        <location filename="../planner.c" line="609"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="615"/>
+        <location filename="../planner.c" line="622"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="622"/>
+        <location filename="../planner.c" line="629"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="635"/>
+        <location filename="../planner.c" line="642"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="638"/>
-        <location filename="../planner.c" line="642"/>
+        <location filename="../planner.c" line="645"/>
+        <location filename="../planner.c" line="649"/>
         <source>%3dmin</source>
         <translation>%3ddak</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="651"/>
+        <location filename="../planner.c" line="658"/>
         <source>(SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="676"/>
+        <location filename="../planner.c" line="683"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="678"/>
+        <location filename="../planner.c" line="685"/>
         <source>Switch gas to %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="697"/>
+        <location filename="../planner.c" line="704"/>
         <source>CNS</source>
         <translation>MSS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="699"/>
+        <location filename="../planner.c" line="706"/>
         <source>OTU</source>
         <translation>OZB</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="710"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="705"/>
+        <location filename="../planner.c" line="712"/>
         <source>Gas consumption:</source>
         <translation>Gaz tüketimi:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="535"/>
-        <location filename="../planner.c" line="725"/>
-        <location filename="../planner.c" line="730"/>
-        <location filename="../planner.c" line="753"/>
+        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="732"/>
+        <location filename="../planner.c" line="737"/>
+        <location filename="../planner.c" line="762"/>
+        <location filename="../planner.c" line="772"/>
         <source>Warning:</source>
         <translation>Uyarı:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="523"/>
+        <location filename="../planner.c" line="530"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="726"/>
+        <location filename="../planner.c" line="733"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="731"/>
+        <location filename="../planner.c" line="738"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="733"/>
+        <location filename="../planner.c" line="740"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="735"/>
+        <location filename="../planner.c" line="742"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="759"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="1064"/>
+        <location filename="../planner.c" line="769"/>
+        <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="1085"/>
         <source>ean</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1099"/>
+        <location filename="../profile.c" line="1113"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1102"/>
+        <location filename="../profile.c" line="1116"/>
         <source>P: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1106"/>
+        <location filename="../profile.c" line="1120"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1112"/>
+        <location filename="../profile.c" line="1126"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1115"/>
+        <location filename="../profile.c" line="1129"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1117"/>
+        <location filename="../profile.c" line="1131"/>
         <source>CNS: %u%%
 </source>
         <translation>MSS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1119"/>
+        <location filename="../profile.c" line="1133"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1121"/>
+        <location filename="../profile.c" line="1135"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1123"/>
+        <location filename="../profile.c" line="1137"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1140"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1147"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -6013,7 +6269,7 @@ EHYD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1137"/>
+        <location filename="../profile.c" line="1151"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -6022,136 +6278,136 @@ EHYD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1149"/>
+        <location filename="../profile.c" line="1163"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1152"/>
+        <location filename="../profile.c" line="1166"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1157"/>
+        <location filename="../profile.c" line="1171"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %udak @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1174"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: bilinmeyen zaman @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1178"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1166"/>
+        <location filename="../profile.c" line="1180"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1183"/>
         <source>TTS: %umin
 </source>
         <translation>YZ: %udak
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1172"/>
+        <location filename="../profile.c" line="1186"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1180"/>
+        <location filename="../profile.c" line="1194"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1196"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1185"/>
+        <location filename="../profile.c" line="1199"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>YZ: %udak (hesap)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1188"/>
+        <location filename="../profile.c" line="1202"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1194"/>
+        <location filename="../profile.c" line="1208"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1214"/>
         <source>heartbeat: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1202"/>
+        <location filename="../profile.c" line="1216"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1205"/>
+        <location filename="../profile.c" line="1219"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1314"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1304"/>
-        <location filename="../profile.c" line="1308"/>
-        <location filename="../profile.c" line="1312"/>
+        <location filename="../profile.c" line="1318"/>
+        <location filename="../profile.c" line="1322"/>
+        <location filename="../profile.c" line="1326"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1316"/>
+        <location filename="../profile.c" line="1330"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1334"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1324"/>
-        <location filename="../profile.c" line="1328"/>
+        <location filename="../profile.c" line="1338"/>
+        <location filename="../profile.c" line="1342"/>
         <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1335"/>
+        <location filename="../profile.c" line="1349"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
@@ -6282,6 +6538,7 @@ EHYD: %d%s
     </message>
     <message>
         <location filename="../dive.c" line="30"/>
+        <location filename="../equipment.c" line="85"/>
         <source>oxygen</source>
         <translation type="unfinished"/>
     </message>
@@ -6336,97 +6593,97 @@ EHYD: %d%s
         <translation>(dalış yok)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sun</source>
         <translation>Pazar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Mon</source>
         <translation>Pazartesi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Tue</source>
         <translation>Salı</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Wed</source>
         <translation>Çarşamba</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Thu</source>
         <translation>Perşembe</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Fri</source>
         <translation>Cuma</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sat</source>
         <translation>Cumartesi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jan</source>
         <translation>Ocak</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Feb</source>
         <translation>Şubat</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Mar</source>
         <translation>Mart</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Apr</source>
         <translation>Nisan</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>May</source>
         <translation>Mayıs</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jun</source>
         <translation>Haziran</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Jul</source>
         <translation>Temmuz</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Aug</source>
         <translation>Ağustos</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Sep</source>
         <translation>Eylül</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Oct</source>
         <translation>Ekim</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Nov</source>
         <translation>Kasım</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Dec</source>
         <translation>Aralık</translation>
     </message>
@@ -7025,13 +7282,13 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
         <source>GF low</source>
         <translation>EF düşük</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>%</source>
         <translation type="unfinished"/>
     </message>
@@ -7041,7 +7298,7 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>EF yüksek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="335"/>
         <source>Drop to first depth</source>
         <translation type="unfinished"/>
     </message>
@@ -7051,69 +7308,69 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>6m son durak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
         <source>Plan backgas breaks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="355"/>
         <source>Gas options</source>
         <translation>Gaz seçenekleri</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="376"/>
         <source>Bottom SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="383"/>
         <source>Deco SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="380"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="390"/>
         <source>Bottom pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="403"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="413"/>
         <source>Deco pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="449"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="462"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="478"/>
         <source>Dive notes</source>
         <translation>Dalış notları</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
         <source>Display runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <source>Display segment duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="531"/>
         <source>Display transitions in deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="538"/>
         <source>Verbatim dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="387"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="410"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="397"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -7133,17 +7390,17 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>yüzeye 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="499"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="515"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/subsurface_vi.ts b/translations/subsurface_vi.ts
index 0ee5d67c5..c330844a4 100644
--- a/translations/subsurface_vi.ts
+++ b/translations/subsurface_vi.ts
@@ -3,12 +3,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="539"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="522"/>
         <source>Person: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="540"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="523"/>
         <source>Searches for buddies and divemasters</source>
         <translation type="unfinished"/>
     </message>
@@ -16,40 +16,188 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="233"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="230"/>
         <source>No buddies</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>ColumnNameProvider</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>GPS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Avg depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="210"/>
+        <location filename="../configuredivecomputer.cpp" line="212"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="226"/>
+        <location filename="../configuredivecomputer.cpp" line="228"/>
         <source>Could not open backup file: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="542"/>
+        <location filename="../configuredivecomputer.cpp" line="552"/>
         <source>Dive computer details read successfully</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="551"/>
+        <location filename="../configuredivecomputer.cpp" line="561"/>
         <source>Setting successfully written to device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="560"/>
+        <location filename="../configuredivecomputer.cpp" line="570"/>
         <source>Device firmware successfully updated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="569"/>
+        <location filename="../configuredivecomputer.cpp" line="579"/>
         <source>Device settings successfully reset</source>
         <translation type="unfinished"/>
     </message>
@@ -847,70 +995,70 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1053"/>
         <source>Backup files (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1037"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1040"/>
         <source>Backup succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1041"/>
         <source>Your settings have been saved to: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1030"/>
         <source>Backup dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1036"/>
         <source>XML backup error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1052"/>
         <source>Restore dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1056"/>
         <source>XML restore error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1057"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1063"/>
         <source>Restore succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1064"/>
         <source>Your settings have been restored successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1074"/>
         <source>Select firmware file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1075"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -968,12 +1116,12 @@
         <translation>Click vào đây sẽ loại bỏ này xi lanh.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="410"/>
         <source>Cylinder cannot be removed</source>
         <translation>Xi lanh không thể được gỡ bỏ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="407"/>
+        <location filename="../qt-ui/models.cpp" line="411"/>
         <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>
@@ -1049,12 +1197,12 @@
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="48"/>
         <source>Remove the selected dive computer?</source>
         <translation>Loại bỏ các Máy Lặn đã chọn?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="49"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
         <translation>Bạn có chắc bạn muốn
@@ -1069,22 +1217,22 @@ bỏ các máy lặn đã được chọn?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Model</source>
         <translation>Mô hình</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Device ID</source>
         <translation>Số hiệu Thiết Bị</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Nickname</source>
         <translation>Tên</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Click vào đây sẽ loại bỏ thông tin về máy lặn này.</translation>
     </message>
@@ -1092,117 +1240,145 @@ bỏ các máy lặn đã được chọn?</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="115"/>
         <source>Bailing out to OC</source>
         <translation>Thoát đến OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="117"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>bắt đầu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>kết thúc</translation>
     </message>
 </context>
 <context>
+    <name>DiveImportedModel</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="556"/>
+        <source>Date/time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
+        <source>Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>h:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>min</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1242"/>
+        <location filename="../qt-ui/models.cpp" line="1248"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1245"/>
+        <location filename="../qt-ui/models.cpp" line="1251"/>
         <source>Date</source>
         <translation>Ngày tháng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1248"/>
+        <location filename="../qt-ui/models.cpp" line="1254"/>
         <source>Rating</source>
         <translation>Xếp hạng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1254"/>
+        <location filename="../qt-ui/models.cpp" line="1260"/>
         <source>Duration</source>
         <translation>Độ dài</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1263"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>kg</source>
         <translation>ký</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1263"/>
+        <location filename="../qt-ui/models.cpp" line="1269"/>
         <source>Suit</source>
         <translation>Đồ lặn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1266"/>
+        <location filename="../qt-ui/models.cpp" line="1272"/>
         <source>Cyl</source>
         <translation>Xlanh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1269"/>
+        <location filename="../qt-ui/models.cpp" line="1275"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>/min</source>
         <translation>/nhỏ nhất</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1277"/>
+        <location filename="../qt-ui/models.cpp" line="1283"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1280"/>
+        <location filename="../qt-ui/models.cpp" line="1286"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1283"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>Location</source>
         <translation>Địa điểm</translation>
     </message>
@@ -1210,87 +1386,87 @@ bỏ các máy lặn đã được chọn?</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="787"/>
+        <location filename="../qt-ui/divelistview.cpp" line="768"/>
         <source>Expand all</source>
         <translation>Mở rộng tất cả</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="788"/>
+        <location filename="../qt-ui/divelistview.cpp" line="769"/>
         <source>Collapse all</source>
         <translation>Mở ra tất cả</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="789"/>
+        <location filename="../qt-ui/divelistview.cpp" line="770"/>
         <source>Collapse others</source>
         <translation>Mở ra tất cả</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="791"/>
+        <location filename="../qt-ui/divelistview.cpp" line="772"/>
         <source>Remove dive(s) from trip</source>
         <translation>Loại bỏ (các)máy lặn từ chuyến đi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="792"/>
+        <location filename="../qt-ui/divelistview.cpp" line="773"/>
         <source>Create new trip above</source>
         <translation>Tạo một chuyến đi mới phía trước</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="806"/>
+        <location filename="../qt-ui/divelistview.cpp" line="787"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Thêm (các)chuyến đi lặn ngay lập tức ở trên</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="808"/>
+        <location filename="../qt-ui/divelistview.cpp" line="789"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Thêm (các)chuyến đi lặn ngay lập tức ở dưới</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="812"/>
+        <location filename="../qt-ui/divelistview.cpp" line="793"/>
         <source>Merge trip with trip above</source>
         <translation>Gập chuyến đi với chuyến đi trước</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="813"/>
+        <location filename="../qt-ui/divelistview.cpp" line="794"/>
         <source>Merge trip with trip below</source>
         <translation>Gộp chuyến đi với chuyến đi bên dưới</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="817"/>
+        <location filename="../qt-ui/divelistview.cpp" line="798"/>
         <source>Delete dive(s)</source>
         <translation>Xóa (các)lần lặn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="819"/>
+        <location filename="../qt-ui/divelistview.cpp" line="800"/>
         <source>Mark dive(s) invalid</source>
         <translation>Đánh dấu (các)lần lặn không hợp lệ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="823"/>
+        <location filename="../qt-ui/divelistview.cpp" line="804"/>
         <source>Merge selected dives</source>
         <translation>Hợp nhất các lần lặn được chọn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="825"/>
+        <location filename="../qt-ui/divelistview.cpp" line="806"/>
         <source>Renumber dive(s)</source>
         <translation>Đánh dấu lại (các)lần lặn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="826"/>
+        <location filename="../qt-ui/divelistview.cpp" line="807"/>
         <source>Shift times</source>
         <translation>Chuyển thời gian</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="827"/>
+        <location filename="../qt-ui/divelistview.cpp" line="808"/>
         <source>Load images</source>
         <translation>Tải hình ảnh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Open image files</source>
         <translation>Mở tập tin hình ảnh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Tập tin hình ảnh (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -1475,100 +1651,100 @@ bỏ các máy lặn đã được chọn?</translation>
         <translation>Cát</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF files (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="268"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>CSV files (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="68"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
         <source>Subsurface native XML format.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
         <source>Write depths of images to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export UDDF file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="267"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
         <source>Export CSV file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="278"/>
         <source>Export world map</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="299"/>
         <source>HTML files (*.html)</source>
         <translation>HTML files (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="283"/>
         <source>Export Subsurface XML</source>
         <translation>Xuất dữ liệu dưới dạng Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="284"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML files (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
         <source>Save image depths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="298"/>
         <source>Export HTML files as</source>
         <translation>Xuất dữ liệu từ tập tin HTML dưới dạng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
         <source>Can&apos;t open file %s</source>
         <translation type="unfinished"/>
     </message>
@@ -1581,247 +1757,227 @@ bỏ các máy lặn đã được chọn?</translation>
         <translation>Nhập dữ liệu từ tập tin ghi nhận các lần lặn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
-        <source>CSV options</source>
-        <translation>Tùy chọn về CSV</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="281"/>
-        <source>Pre-configured imports</source>
-        <translation>Chỉnh sửa trước khi nhập dữ liệu</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="122"/>
-        <source>Depth</source>
-        <translation>Độ sâu</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="142"/>
-        <source>Stopdepth</source>
-        <translation>Độ sâu giới hạn</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="162"/>
-        <source>Pressure</source>
-        <translation>Áp suất</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="176"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="466"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
         <source>Time</source>
         <translation>Thời gian</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="183"/>
-        <source>Temp</source>
-        <translation>Nhiệt độ</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="97"/>
+        <source>Metric</source>
+        <translation>Số liệu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="213"/>
-        <source>NDL</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="102"/>
+        <source>Imperial</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="233"/>
-        <source>TTS</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="59"/>
+        <source>dd.mm.yyyy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="253"/>
-        <source>Cns</source>
-        <translation>Cns</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="58"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="789"/>
-        <source>Field separator</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="64"/>
+        <source>mm/dd/yyyy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="35"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="363"/>
-        <source>Units</source>
-        <translation>Đơn vị</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="69"/>
+        <source>yyyy-mm-dd</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="42"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="370"/>
-        <source>Metric</source>
-        <translation>Số liệu</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="47"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="375"/>
-        <source>Imperial</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+        <source>Dive #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="169"/>
-        <source>pO₂</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
+        <source>Date</source>
+        <translation>Ngày tháng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="298"/>
-        <source>Manual dives</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
+        <source>Duration</source>
+        <translation>Độ dài</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="316"/>
-        <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
+        <source>GPS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="319"/>
-        <source>Date format</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+        <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="332"/>
-        <source>dd.mm.yyyy</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+        <source>O₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="337"/>
-        <source>mm/dd/yyyy</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+        <source>He</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="342"/>
-        <source>yyyy-mm-dd</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="78"/>
+        <source>Seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="392"/>
-        <source>Dive #</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
+        <source>Minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="426"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="439"/>
-        <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="88"/>
+        <source>Minutes:seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="429"/>
-        <source>Date</source>
-        <translation>Ngày tháng</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+        <source>Location</source>
+        <translation>Địa điểm</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="500"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="513"/>
-        <source>Dive duration in seconds or in min:sec format</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+        <source>Max depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="503"/>
-        <source>Duration</source>
-        <translation>Độ dài</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+        <source>Tab</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="574"/>
-        <source>GPS</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="591"/>
-        <source>Tags</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+        <source>Sample time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="608"/>
-        <source>Cyl size</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+        <source>Sample depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="625"/>
-        <source>Air temp</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+        <source>Sample temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="642"/>
-        <source>Start Pressure</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+        <source>Sample po2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="659"/>
-        <source>Water temp</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+        <source>Sample cns</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="676"/>
-        <source>End Press</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+        <source>Sample ndl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="693"/>
-        <source>O₂</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+        <source>Sample tts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="710"/>
-        <source>He</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+        <source>Sample stopdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="742"/>
-        <source>Choose duration format.</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+        <source>Samples pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="745"/>
-        <source>Duration format</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+        <source>Sample pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="758"/>
-        <source>Seconds</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
+        <source>Mean depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="763"/>
-        <source>Minutes</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+        <source>Divemaster</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="768"/>
-        <source>Minutes:seconds</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
+        <source>Buddy</source>
+        <translation>Bạn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="540"/>
-        <source>Location</source>
-        <translation>Địa điểm</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+        <source>Notes</source>
+        <translation>Ghi chú</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="409"/>
-        <source>Max depth</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
+        <source>Weight</source>
+        <translation>Cân nặng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="386"/>
-        <source>Field configuration</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+        <source>Cyl. size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="449"/>
-        <source>Mean depth</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+        <source>Start pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="483"/>
-        <source>Buddy</source>
-        <translation>Bạn</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="523"/>
-        <source>Notes</source>
-        <translation>Ghi chú</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="557"/>
-        <source>Weight</source>
-        <translation>Cân nặng</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1865,42 +2021,42 @@ bỏ các máy lặn đã được chọn?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
         <source>unknown</source>
         <translation>chưa rõ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="691"/>
         <source>Final depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="693"/>
         <source>Run time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="701"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="695"/>
         <source>Duration</source>
         <translation>Độ dài</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="703"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
         <source>Used gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="705"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
         <source>CC set point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1044"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1051"/>
         <source>Discard the plan?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1045"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1052"/>
         <source>You are about to discard your plan.</source>
         <translation type="unfinished"/>
     </message>
@@ -1908,22 +2064,22 @@ bỏ các máy lặn đã được chọn?</translation>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="257"/>
         <source>Dive planner points</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="261"/>
         <source>Available gases</source>
         <translation>Dưỡng khí hiện có</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="284"/>
         <source>Add dive data point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="304"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="293"/>
         <source>Save new</source>
         <translation type="unfinished"/>
     </message>
@@ -1931,92 +2087,112 @@ bỏ các máy lặn đã được chọn?</translation>
 <context>
     <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Depth</source>
         <translation>Độ sâu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
         <source>Time</source>
         <translation>Thời gian</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
         <source>Pressure</source>
         <translation>Áp suất</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>Temperature</source>
         <translation>Nhiệt độ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
         <source>Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
         <source>Pressure S</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
         <source>pN₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
         <source>pHe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
         <source>pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
+        <source>Setpoint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
+        <source>Sensor1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
+        <source>Sensor2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
+        <source>Sensor3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
         <source>Ambient pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
-        <source>Heart Beat</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
+        <source>Heart beat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
-        <source>Gradient Factor</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/>
+        <source>Gradient factor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
-        <source>Mean Depth/s</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
+        <source>Mean depth/s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
         <source>Pressure I</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
         <source>User entered</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
         <source>Cylinder index</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
         <source>Ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
@@ -2067,127 +2243,127 @@ bỏ các máy lặn đã được chọn?</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1437"/>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1443"/>
+        <location filename="../qt-ui/models.cpp" line="1489"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1440"/>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1492"/>
         <source>Date</source>
         <translation>Ngày tháng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1443"/>
-        <location filename="../qt-ui/models.cpp" line="1489"/>
+        <location filename="../qt-ui/models.cpp" line="1449"/>
+        <location filename="../qt-ui/models.cpp" line="1495"/>
         <source>Rating</source>
         <translation>Xếp hạng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1452"/>
         <source>Depth</source>
         <translation>Độ sâu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1458"/>
         <source>Temp</source>
         <translation>Nhiệt độ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1461"/>
         <source>Weight</source>
         <translation>Cân nặng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1458"/>
-        <location filename="../qt-ui/models.cpp" line="1504"/>
+        <location filename="../qt-ui/models.cpp" line="1464"/>
+        <location filename="../qt-ui/models.cpp" line="1510"/>
         <source>Suit</source>
         <translation>Đồ lặn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1461"/>
-        <location filename="../qt-ui/models.cpp" line="1507"/>
+        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1513"/>
         <source>Cyl</source>
         <translation>Xlanh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1464"/>
-        <location filename="../qt-ui/models.cpp" line="1510"/>
+        <location filename="../qt-ui/models.cpp" line="1470"/>
+        <location filename="../qt-ui/models.cpp" line="1516"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>/min</source>
         <translation>/nhỏ nhất</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1473"/>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1527"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
-        <location filename="../qt-ui/models.cpp" line="1524"/>
+        <location filename="../qt-ui/models.cpp" line="1482"/>
+        <location filename="../qt-ui/models.cpp" line="1530"/>
         <source>Location</source>
         <translation>Địa điểm</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>kg</source>
         <translation>ký</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1449"/>
-        <location filename="../qt-ui/models.cpp" line="1495"/>
+        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1501"/>
         <source>Duration</source>
         <translation>Độ dài</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1498"/>
+        <location filename="../qt-ui/models.cpp" line="1504"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1470"/>
-        <location filename="../qt-ui/models.cpp" line="1518"/>
+        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1524"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -2195,94 +2371,94 @@ bỏ các máy lặn đã được chọn?</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="98"/>
         <source>no dives were selected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="117"/>
         <source>failed to create zip file for upload: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="143"/>
         <source>cannot create temporary file: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/>
         <source>internal error: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="169"/>
         <source>internal error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="629"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="828"/>
         <source>Done</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/>
         <source>Uploading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="692"/>
         <source>Downloading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="741"/>
         <source>Downloading %1 dives...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="785"/>
         <source>Download finished - %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="802"/>
         <source>Corrupted download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>The archive could not be opened:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
         <source>Upload failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/>
         <source>Upload successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
         <source>Login failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
         <source>Cannot parse response</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
         <source>Error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="829"/>
         <source>Upload finished</source>
         <translation type="unfinished"/>
     </message>
@@ -2290,54 +2466,52 @@ bỏ các máy lặn đã được chọn?</translation>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
-        <source>OK</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="169"/>
         <source>Error</source>
         <translation>Lỗi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="400"/>
         <source>Retry</source>
         <translation>Thử lại</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="264"/>
         <source>Find Uemis dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Log files (*.log)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="362"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="363"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="374"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="375"/>
         <source>Dump files (*.bin)</source>
         <translation type="unfinished"/>
     </message>
@@ -2345,7 +2519,7 @@ bỏ các máy lặn đã được chọn?</translation>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="101"/>
         <source>Vendor</source>
         <translation type="unfinished"/>
     </message>
@@ -2355,54 +2529,74 @@ bỏ các máy lặn đã được chọn?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="31"/>
         <source>Device or mount point</source>
         <translation>Thiết bị hoặc điểm kết nối</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="111"/>
         <source>Dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="132"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="45"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="80"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="94"/>
         <source>...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="52"/>
         <source>Force download of all dives</source>
         <translation>Buộc tải về tất cả các lần lặn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
         <source>Always prefer downloaded dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="189"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/>
+        <source>Downloaded Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
+        <source>Select all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
+        <source>Unselect all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
         <source>Save libdivecomputer logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="87"/>
         <source>Save libdivecomputer dumpfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
         <source>Download into new trip</source>
         <translation type="unfinished"/>
     </message>
@@ -2410,12 +2604,12 @@ bỏ các máy lặn đã được chọn?</translation>
 <context>
     <name>ExtraDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Value</source>
         <translation type="unfinished"/>
     </message>
@@ -2429,21 +2623,21 @@ bỏ các máy lặn đã được chọn?</translation>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="245"/>
-        <source>Your dive profile was updated to facebook.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
-        <source>Photo Upload Failed</source>
+        <source>Your dive profile was updated to Facebook.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="250"/>
-        <source>Your dive profile was not updated to facebook, 
+        <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+        <source>Photo Upload Failed</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>FilterWidget</name>
@@ -2484,17 +2678,17 @@ bỏ các máy lặn đã được chọn?</translation>
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1544"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1621"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1624"/>
         <source>Firmware update failed!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1550"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1627"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -2502,7 +2696,7 @@ bỏ các máy lặn đã được chọn?</translation>
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="128"/>
+        <location filename="../qt-ui/globe.cpp" line="119"/>
         <source>Edit selected dive locations</source>
         <translation type="unfinished"/>
     </message>
@@ -2510,7 +2704,7 @@ bỏ các máy lặn đã được chọn?</translation>
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="566"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="549"/>
         <source>Location: </source>
         <translation type="unfinished"/>
     </message>
@@ -2518,7 +2712,7 @@ bỏ các máy lặn đã được chọn?</translation>
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="286"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="283"/>
         <source>No location set</source>
         <translation type="unfinished"/>
     </message>
@@ -2526,347 +2720,352 @@ bỏ các máy lặn đã được chọn?</translation>
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="133"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
+        <location filename="../qt-ui/maintab.cpp" line="497"/>
         <source>Location</source>
         <translation>Địa điểm</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="67"/>
         <source>Coordinates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="169"/>
         <source>Divemaster</source>
         <translation>Người lặn giỏi nhất</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="154"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Buddy</source>
         <translation>Bạn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="222"/>
+        <location filename="../qt-ui/maintab.ui" line="277"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="186"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
         <source>Rating</source>
         <translation>Xếp hạng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="221"/>
         <source>Visibility</source>
         <translation>Tầm nhìn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="230"/>
         <source>Suit</source>
         <translation>Đồ lặn</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="465"/>
+        <location filename="../qt-ui/maintab.cpp" line="470"/>
         <source>Dive notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
-        <location filename="../qt-ui/maintab.ui" line="648"/>
-        <location filename="../qt-ui/maintab.cpp" line="277"/>
+        <location filename="../qt-ui/maintab.ui" line="74"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="102"/>
+        <location filename="../qt-ui/maintab.ui" line="677"/>
+        <location filename="../qt-ui/maintab.cpp" line="279"/>
         <source>Air temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <location filename="../qt-ui/maintab.ui" line="667"/>
-        <location filename="../qt-ui/maintab.cpp" line="278"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.ui" line="696"/>
+        <location filename="../qt-ui/maintab.cpp" line="280"/>
         <source>Water temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="229"/>
-        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.ui" line="284"/>
+        <location filename="../qt-ui/maintab.cpp" line="498"/>
         <source>Notes</source>
         <translation>Ghi chú</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="369"/>
+        <location filename="../qt-ui/maintab.ui" line="398"/>
         <source>Equipment</source>
         <translation>Dụng cụ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="496"/>
+        <location filename="../qt-ui/maintab.ui" line="525"/>
         <source>Gases used</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="515"/>
+        <location filename="../qt-ui/maintab.ui" line="544"/>
         <source>Gas consumed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="553"/>
+        <location filename="../qt-ui/maintab.ui" line="582"/>
         <source>CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="591"/>
+        <location filename="../qt-ui/maintab.ui" line="620"/>
         <source>Max. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="629"/>
+        <location filename="../qt-ui/maintab.ui" line="658"/>
         <source>Air pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="686"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>Dive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="845"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
         <source>Total time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="903"/>
+        <location filename="../qt-ui/maintab.ui" line="932"/>
         <source>Gas consumption</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="962"/>
+        <location filename="../qt-ui/maintab.ui" line="991"/>
         <source>Extra data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="968"/>
+        <location filename="../qt-ui/maintab.ui" line="997"/>
         <source>Additional data from dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="54"/>
-        <location filename="../qt-ui/maintab.ui" line="458"/>
+        <location filename="../qt-ui/maintab.ui" line="83"/>
+        <location filename="../qt-ui/maintab.ui" line="487"/>
         <source>Date</source>
         <translation>Ngày tháng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="61"/>
+        <location filename="../qt-ui/maintab.ui" line="90"/>
         <source>Time</source>
         <translation>Thời gian</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="425"/>
+        <location filename="../qt-ui/maintab.ui" line="454"/>
         <source>Dive info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="477"/>
+        <location filename="../qt-ui/maintab.ui" line="506"/>
         <source>Interval</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="534"/>
-        <location filename="../qt-ui/maintab.ui" line="799"/>
+        <location filename="../qt-ui/maintab.ui" line="563"/>
+        <location filename="../qt-ui/maintab.ui" line="828"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="610"/>
+        <location filename="../qt-ui/maintab.ui" line="639"/>
         <source>Avg. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="572"/>
+        <location filename="../qt-ui/maintab.ui" line="601"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="734"/>
         <source>Salinity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="742"/>
+        <location filename="../qt-ui/maintab.ui" line="771"/>
         <source>Stats</source>
         <translation>Trạng thái</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="775"/>
+        <location filename="../qt-ui/maintab.ui" line="804"/>
         <source>Depth</source>
         <translation>Độ sâu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="787"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Temperature</source>
         <translation>Nhiệt độ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="813"/>
+        <location filename="../qt-ui/maintab.ui" line="842"/>
         <source>Duration</source>
         <translation>Độ dài</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="864"/>
+        <location filename="../qt-ui/maintab.ui" line="893"/>
         <source>Dives</source>
         <translation>Lần lặn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="948"/>
+        <location filename="../qt-ui/maintab.ui" line="977"/>
         <source>Photos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="95"/>
+        <location filename="../qt-ui/maintab.cpp" line="87"/>
         <source>Cylinders</source>
         <translation>Xilanh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="99"/>
+        <location filename="../qt-ui/maintab.cpp" line="91"/>
         <source>Weights</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="55"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Apply changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="59"/>
+        <location filename="../qt-ui/maintab.cpp" line="50"/>
         <source>Discard changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="96"/>
+        <location filename="../qt-ui/maintab.cpp" line="88"/>
         <source>Add cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="100"/>
+        <location filename="../qt-ui/maintab.cpp" line="92"/>
         <source>Add weight system</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="274"/>
+        <location filename="../qt-ui/maintab.cpp" line="276"/>
         <source>Air temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="275"/>
+        <location filename="../qt-ui/maintab.cpp" line="277"/>
         <source>Water temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="312"/>
+        <location filename="../qt-ui/maintab.cpp" line="314"/>
         <source>This trip is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="320"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Multiple dives are being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.cpp" line="324"/>
         <source>This dive is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="436"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
+        <location filename="../qt-ui/maintab.cpp" line="465"/>
         <source>Trip notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="458"/>
+        <location filename="../qt-ui/maintab.cpp" line="463"/>
         <source>Trip location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="526"/>
-        <location filename="../qt-ui/maintab.cpp" line="558"/>
-        <location filename="../qt-ui/maintab.cpp" line="562"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
         <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="574"/>
         <source>/min</source>
         <translation>/nhỏ nhất</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="555"/>
+        <location filename="../qt-ui/maintab.cpp" line="563"/>
         <source>Deepest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="556"/>
+        <location filename="../qt-ui/maintab.cpp" line="564"/>
         <source>Shallowest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="569"/>
+        <location filename="../qt-ui/maintab.cpp" line="577"/>
         <source>Highest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="578"/>
         <source>Lowest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="571"/>
+        <location filename="../qt-ui/maintab.cpp" line="579"/>
         <source>Average total SAC of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="582"/>
+        <location filename="../qt-ui/maintab.cpp" line="590"/>
         <source>Highest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="583"/>
+        <location filename="../qt-ui/maintab.cpp" line="591"/>
         <source>Lowest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="584"/>
+        <location filename="../qt-ui/maintab.cpp" line="592"/>
         <source>Average temperature of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="594"/>
+        <location filename="../qt-ui/maintab.cpp" line="602"/>
         <source>Longest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="595"/>
+        <location filename="../qt-ui/maintab.cpp" line="603"/>
         <source>Shortest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="596"/>
+        <location filename="../qt-ui/maintab.cpp" line="604"/>
         <source>Average length of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="620"/>
+        <location filename="../qt-ui/maintab.cpp" line="628"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="624"/>
+        <location filename="../qt-ui/maintab.cpp" line="632"/>
         <source> and </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="911"/>
+        <location filename="../qt-ui/maintab.cpp" line="925"/>
         <source>Discard the changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="912"/>
+        <location filename="../qt-ui/maintab.cpp" line="926"/>
         <source>You are about to discard your changes.</source>
         <translation type="unfinished"/>
     </message>
@@ -3009,7 +3208,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="296"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="232"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
@@ -3369,90 +3568,90 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="252"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="229"/>
         <source>Open file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="256"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="233"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="332"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="309"/>
         <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="444"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
         <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="491"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
         <source>Print runtime table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="834"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="811"/>
         <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="836"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="813"/>
         <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="841"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="818"/>
         <source>Save changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1196"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1173"/>
         <source>Save file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1337"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1314"/>
         <source>Open dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="819"/>
         <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="300"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="444"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="277"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1180"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1157"/>
         <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="625"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="602"/>
         <source>Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1197"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1174"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1338"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1315"/>
         <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"/>
     </message>
@@ -3460,7 +3659,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="651"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="634"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation type="unfinished"/>
     </message>
@@ -3468,39 +3667,39 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="239"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="243"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="244"/>
         <source>Not now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="245"/>
         <source>Update firmware</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
         <source>Firmware upgrade notice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
         <source>Save the downloaded firmware as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
         <source>HEX files (*.hex)</source>
         <translation type="unfinished"/>
     </message>
@@ -3508,54 +3707,69 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Open circuit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>ft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="481"/>
         <source>Last stop at 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="482"/>
         <source>50% avg. depth to 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="489"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
         <source>20ft to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="485"/>
         <source>m/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
         <source>Last stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
         <source>50% avg. depth to 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="494"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
         <source>6m to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="497"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="498"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
         <source>cuft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="506"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="507"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="500"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="501"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
@@ -3674,6 +3888,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="816"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -3708,57 +3923,87 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>ký</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="795"/>
+        <source>CCR: Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="809"/>
+        <source>Default CCR set-point for dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="832"/>
+        <source>pSCR O₂ metabolism rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="839"/>
+        <source>pSCR ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="846"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="859"/>
+        <source>1:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="875"/>
         <source>System default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="843"/>
+        <location filename="../qt-ui/preferences.ui" line="914"/>
         <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="849"/>
+        <location filename="../qt-ui/preferences.ui" line="920"/>
         <source>Proxy type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="862"/>
+        <location filename="../qt-ui/preferences.ui" line="933"/>
         <source>Host</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="888"/>
+        <location filename="../qt-ui/preferences.ui" line="959"/>
         <source>Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="914"/>
+        <location filename="../qt-ui/preferences.ui" line="985"/>
         <source>Requires authentication</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="934"/>
+        <location filename="../qt-ui/preferences.ui" line="1005"/>
         <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="957"/>
+        <location filename="../qt-ui/preferences.ui" line="1028"/>
         <source>Password</source>
         <translation>Mật khẩu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="985"/>
-        <source>about:blank</source>
+        <location filename="../qt-ui/preferences.ui" line="1079"/>
+        <source>Disconnect from Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1011"/>
-        <source>Disconnect from facebook</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="824"/>
+        <location filename="../qt-ui/preferences.ui" line="895"/>
         <source>Filter</source>
         <translation>Bộ lọc</translation>
     </message>
@@ -3913,52 +4158,52 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="28"/>
+        <location filename="../qt-ui/preferences.cpp" line="44"/>
         <source>No proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="29"/>
+        <location filename="../qt-ui/preferences.cpp" line="45"/>
         <source>System proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="30"/>
+        <location filename="../qt-ui/preferences.cpp" line="46"/>
         <source>HTTP proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="31"/>
+        <location filename="../qt-ui/preferences.cpp" line="47"/>
         <source>SOCKS proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="291"/>
+        <location filename="../qt-ui/preferences.cpp" line="324"/>
         <source>Restart required</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="292"/>
+        <location filename="../qt-ui/preferences.cpp" line="325"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="456"/>
+        <location filename="../qt-ui/preferences.cpp" line="494"/>
         <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Open default log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="455"/>
+        <location filename="../qt-ui/preferences.cpp" line="493"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
@@ -3966,17 +4211,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="91"/>
+        <location filename="../qt-ui/printdialog.cpp" line="85"/>
         <source>&amp;Preview</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="88"/>
+        <location filename="../qt-ui/printdialog.cpp" line="82"/>
         <source>P&amp;rint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="103"/>
+        <location filename="../qt-ui/printdialog.cpp" line="97"/>
         <source>Print</source>
         <translation type="unfinished"/>
     </message>
@@ -3984,42 +4229,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="20"/>
         <source>Dive#</source>
         <translation>Lần lặn#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="21"/>
         <source>Date</source>
         <translation>Ngày tháng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="22"/>
         <source>Depth</source>
         <translation>Độ sâu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="23"/>
         <source>Duration</source>
         <translation>Độ dài</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Master</source>
         <translation>Giỏi nhất</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Buddy</source>
         <translation>Bạn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="34"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Location</source>
         <translation>Địa điểm</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <location filename="../qt-ui/printlayout.cpp" line="63"/>
         <source>Subsurface cannot find a usable printer on this system!</source>
         <translation type="unfinished"/>
     </message>
@@ -4085,72 +4330,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2095"/>
+        <location filename="../qt-ui/models.cpp" line="2101"/>
         <source>unknown</source>
         <translation>chưa rõ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2100"/>
+        <location filename="../qt-ui/models.cpp" line="2106"/>
         <source>Dive #%1 - %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2103"/>
+        <location filename="../qt-ui/models.cpp" line="2109"/>
         <source>Max depth: %1 %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2110"/>
+        <location filename="../qt-ui/models.cpp" line="2116"/>
         <source>Duration: %1 min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2115"/>
+        <location filename="../qt-ui/models.cpp" line="2121"/>
         <source>Gas used:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2117"/>
+        <location filename="../qt-ui/models.cpp" line="2123"/>
         <source>Tags:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2119"/>
+        <location filename="../qt-ui/models.cpp" line="2125"/>
         <source>SAC:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2121"/>
+        <location filename="../qt-ui/models.cpp" line="2127"/>
         <source>Weights:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2126"/>
+        <location filename="../qt-ui/models.cpp" line="2132"/>
         <source>Notes:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2133"/>
+        <location filename="../qt-ui/models.cpp" line="2139"/>
         <source>Divemaster:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2135"/>
+        <location filename="../qt-ui/models.cpp" line="2141"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2137"/>
+        <location filename="../qt-ui/models.cpp" line="2143"/>
         <source>Suit:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2139"/>
+        <location filename="../qt-ui/models.cpp" line="2145"/>
         <source>Viz:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2141"/>
+        <location filename="../qt-ui/models.cpp" line="2147"/>
         <source>Rating:</source>
         <translation type="unfinished"/>
     </message>
@@ -4158,103 +4403,108 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="628"/>
         <source> (#%1 of %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="630"/>
+        <source>Unknown dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="647"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1168"/>
         <source>Make first divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Delete this divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1184"/>
         <source>Add gas change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1187"/>
         <source> (Tank %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1195"/>
         <source>Add set-point change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1197"/>
         <source>Add bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
         <source>Remove event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1206"/>
         <source>Hide similar events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1213"/>
         <source>Edit name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1242"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1249"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1264"/>
         <source>Unhide all events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide all %1 events?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1333"/>
         <source>Remove the selected event?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1334"/>
         <source>%1 @ %2:%3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1424"/>
         <source>Edit name of bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
         <source>Custom name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1430"/>
         <source>Name is too long!</source>
         <translation type="unfinished"/>
     </message>
@@ -4262,102 +4512,102 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>AIR</source>
         <translation>KHÔNG KHÍ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>OXYGEN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="208"/>
         <source>Remove this point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="57"/>
         <source>Close</source>
         <translation>Đóng lại</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="42"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="25"/>
         <source>Average</source>
         <translation>Trung bình</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="45"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="28"/>
         <source>Minimum</source>
         <translation>Nhỏ nhất</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="48"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="31"/>
         <source>Maximum</source>
         <translation>Tối đa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="297"/>
+        <location filename="../qt-ui/globe.cpp" line="296"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="525"/>
         <source>kg</source>
         <translation>ký</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="526"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="550"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="551"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="570"/>
+        <location filename="../qt-ui/models.cpp" line="574"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="571"/>
+        <location filename="../qt-ui/models.cpp" line="575"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="595"/>
+        <location filename="../qt-ui/models.cpp" line="599"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="596"/>
+        <location filename="../qt-ui/models.cpp" line="600"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="513"/>
         <source>Invalid response from server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="567"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation type="unfinished"/>
     </message>
@@ -4365,12 +4615,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1450"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1518"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1442"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -4384,12 +4634,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
-        <location filename="../qt-ui/simplewidgets.cpp" line="151"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="134"/>
         <source>New starting number</source>
         <translation>Số bắt đầu mới</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="149"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="132"/>
         <source>New number</source>
         <translation type="unfinished"/>
     </message>
@@ -4397,12 +4647,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1575"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1653"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1579"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1657"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -4481,12 +4731,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="276"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="259"/>
         <source>Open image file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="278"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="261"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Tập tin hình ảnh (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -4539,7 +4789,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <name>SocialNetworkDialog</name>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="282"/>
-        <source>Dive Date: %1 
+        <source>Dive date: %1 
 </source>
         <translation type="unfinished"/>
     </message>
@@ -4563,7 +4813,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="290"/>
-        <source>Dive Location: %1 
+        <source>Dive location: %1 
 </source>
         <translation type="unfinished"/>
     </message>
@@ -4680,47 +4930,47 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="329"/>
         <source>Webservice</source>
         <translation>Dịch vụ web</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="393"/>
         <source>Connecting...</source>
         <translation>Đang kết nối...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
         <source>Download finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Download error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="436"/>
         <source>Connection error: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
         <source>Download successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="439"/>
         <source>Invalid user identifier!</source>
         <translation>Nhận dạng người dùng không hợp lệ!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="312"/>
         <source>Enter User ID and click Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="442"/>
         <source>Cannot parse response!</source>
         <translation>Không nhận được trả lời!</translation>
     </message>
@@ -4728,7 +4978,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="592"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="575"/>
         <source>Suits: </source>
         <translation type="unfinished"/>
     </message>
@@ -4736,7 +4986,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="119"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="116"/>
         <source>No suit set</source>
         <translation type="unfinished"/>
     </message>
@@ -4753,7 +5003,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="513"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="496"/>
         <source>Tags: </source>
         <translation type="unfinished"/>
     </message>
@@ -4761,7 +5011,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="144"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="141"/>
         <source>Empty tags</source>
         <translation type="unfinished"/>
     </message>
@@ -4769,17 +5019,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -4787,7 +5037,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="141"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="131"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
@@ -4795,7 +5045,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1090"/>
+        <location filename="../qt-ui/models.cpp" line="1094"/>
         <source> (%1 shown)</source>
         <translation type="unfinished"/>
     </message>
@@ -4803,72 +5053,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="64"/>
         <source>Check for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="66"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="70"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="72"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
         <source>Please check your internet connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="85"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="84"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="88"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="95"/>
         <source>A new version of Subsurface is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="97"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
         <source>Latest version is %1, please check with your OS vendor for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="103"/>
         <source>Newest release version is </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="105"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
         <source>The server returned the following information:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="121"/>
         <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
         <source>Decline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="124"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
         <source>Accept</source>
         <translation>Chấp nhậ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="126"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="125"/>
         <source>Automatic check for updates</source>
         <translation type="unfinished"/>
     </message>
@@ -4876,13 +5126,13 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UserManual</name>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="55"/>
+        <location filename="../qt-ui/usermanual.cpp" line="54"/>
         <source>User Manual</source>
         <translation>Hướng dẫn sử dụng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="72"/>
-        <location filename="../qt-ui/usermanual.cpp" line="78"/>
+        <location filename="../qt-ui/usermanual.cpp" line="71"/>
+        <location filename="../qt-ui/usermanual.cpp" line="77"/>
         <source>Cannot find the Subsurface manual</source>
         <translation type="unfinished"/>
     </message>
@@ -4960,81 +5210,81 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
         <source>
 Operating System: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
         <source>
 CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 Language: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="93"/>
         <source>Should we ask you later?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Don&apos;t ask me again</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Ask later</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
         <source>Submit user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask again?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="17"/>
         <source>Send</source>
         <translation>Gửi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="121"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>Please check your internet connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="131"/>
         <source>Survey successfully submitted.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="136"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation type="unfinished"/>
     </message>
@@ -5042,12 +5292,12 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>kg</source>
         <translation>ký</translation>
     </message>
@@ -5095,12 +5345,12 @@ OS CPU Architecture: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="247"/>
         <source>Operation timed out</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="268"/>
         <source>Transferring data...</source>
         <translation type="unfinished"/>
     </message>
@@ -5108,17 +5358,17 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Type</source>
         <translation>Loại</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Weight</source>
         <translation>Cân nặng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="496"/>
+        <location filename="../qt-ui/models.cpp" line="500"/>
         <source>Clicking here will remove this weight system.</source>
         <translation type="unfinished"/>
     </message>
@@ -5126,19 +5376,19 @@ OS CPU Architecture: %1</source>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1479"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1487"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1497"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1555"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1566"/>
         <source>Failed!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1506"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1576"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1580"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -5146,70 +5396,70 @@ OS CPU Architecture: %1</source>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1841"/>
+        <location filename="../qt-ui/models.cpp" line="1847"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1844"/>
+        <location filename="../qt-ui/models.cpp" line="1850"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1847"/>
+        <location filename="../qt-ui/models.cpp" line="1853"/>
         <source>Duration 
  Total</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1850"/>
+        <location filename="../qt-ui/models.cpp" line="1856"/>
         <source>
 Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1853"/>
+        <location filename="../qt-ui/models.cpp" line="1859"/>
         <source>
 Shortest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1856"/>
+        <location filename="../qt-ui/models.cpp" line="1862"/>
         <source>
 Longest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1859"/>
+        <location filename="../qt-ui/models.cpp" line="1865"/>
         <source>Depth (%1)
  Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1862"/>
-        <location filename="../qt-ui/models.cpp" line="1871"/>
-        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>
 Minimum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1865"/>
-        <location filename="../qt-ui/models.cpp" line="1874"/>
-        <location filename="../qt-ui/models.cpp" line="1883"/>
+        <location filename="../qt-ui/models.cpp" line="1871"/>
+        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>
 Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1874"/>
         <source>SAC (%1)
  Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1883"/>
         <source>Temp. (%1)
  Average</source>
         <translation type="unfinished"/>
@@ -5289,40 +5539,40 @@ Maximum</source>
         <translation>ký</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1508"/>
+        <location filename="../dive.c" line="1530"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) hoặc (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="464"/>
+        <location filename="../divelist.c" line="467"/>
         <location filename="../equipment.c" line="81"/>
-        <location filename="../planner.c" line="1060"/>
-        <location filename="../planner.c" line="1063"/>
+        <location filename="../planner.c" line="1081"/>
+        <location filename="../planner.c" line="1084"/>
         <source>air</source>
         <translation>không khí</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="192"/>
+        <location filename="../equipment.c" line="194"/>
         <source>integrated</source>
         <translation>được tích hợp</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="193"/>
+        <location filename="../equipment.c" line="195"/>
         <source>belt</source>
         <translation>dây ràng</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="194"/>
+        <location filename="../equipment.c" line="196"/>
         <source>ankle</source>
         <translation>mắt cá chân</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="195"/>
+        <location filename="../equipment.c" line="197"/>
         <source>backplate weight</source>
         <translation>cân nặng giáp che</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="196"/>
+        <location filename="../equipment.c" line="198"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -5330,7 +5580,7 @@ Maximum</source>
         <location filename="../file.c" line="112"/>
         <location filename="../file.c" line="434"/>
         <location filename="../file.c" line="506"/>
-        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="925"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Thất bại khi đọc dữ liệu &apos;%s&apos;</translation>
     </message>
@@ -5387,9 +5637,9 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../file.c" line="869"/>
-        <location filename="../file.c" line="909"/>
-        <location filename="../file.c" line="1007"/>
+        <location filename="../file.c" line="870"/>
+        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="1016"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation type="unfinished"/>
     </message>
@@ -5560,27 +5810,27 @@ Maximum</source>
         <translation>chỉ số sự kiện không hợp lệ</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="421"/>
+        <location filename="../libdivecomputer.c" line="419"/>
         <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="427"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Error registering the data</source>
         <translation>Lỗi khi đăng ký dữ liệu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="433"/>
         <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="451"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Dive %d: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="455"/>
+        <location filename="../libdivecomputer.c" line="454"/>
         <source>Error parsing the divetime</source>
         <translation>Lỗi khi chuyển thông số thời gian lặn</translation>
     </message>
@@ -5590,156 +5840,156 @@ Maximum</source>
         <translation>Lỗi khi chuyển thông số độ sâu tối đa</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="482"/>
+        <location filename="../libdivecomputer.c" line="483"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="501"/>
+        <location filename="../libdivecomputer.c" line="503"/>
         <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="513"/>
+        <location filename="../libdivecomputer.c" line="515"/>
         <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="521"/>
+        <location filename="../libdivecomputer.c" line="524"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="545"/>
+        <location filename="../libdivecomputer.c" line="549"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="562"/>
+        <location filename="../libdivecomputer.c" line="569"/>
         <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="569"/>
+        <location filename="../libdivecomputer.c" line="576"/>
         <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="706"/>
+        <location filename="../libdivecomputer.c" line="713"/>
         <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="714"/>
+        <location filename="../libdivecomputer.c" line="721"/>
         <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="778"/>
+        <location filename="../libdivecomputer.c" line="785"/>
         <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="783"/>
+        <location filename="../libdivecomputer.c" line="790"/>
         <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="804"/>
+        <location filename="../libdivecomputer.c" line="811"/>
         <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="843"/>
+        <location filename="../libdivecomputer.c" line="850"/>
         <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="850"/>
+        <location filename="../libdivecomputer.c" line="857"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Không thể mở %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="858"/>
+        <location filename="../libdivecomputer.c" line="865"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="506"/>
+        <location filename="../parse-xml.c" line="516"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Đang đọc tỉ lệ lạ %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1760"/>
+        <location filename="../parse-xml.c" line="1770"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Thất bại khi chuyển thông số &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1989"/>
-        <location filename="../parse-xml.c" line="2137"/>
+        <location filename="../parse-xml.c" line="1999"/>
+        <location filename="../parse-xml.c" line="2147"/>
         <source>Database query dm4_events failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1996"/>
-        <location filename="../parse-xml.c" line="2144"/>
+        <location filename="../parse-xml.c" line="2006"/>
+        <location filename="../parse-xml.c" line="2154"/>
         <source>Database query dm4_tags failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2318"/>
+        <location filename="../parse-xml.c" line="2328"/>
         <source>Database query shearwater_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2325"/>
+        <location filename="../parse-xml.c" line="2335"/>
         <source>Database query shearwater_changes failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2332"/>
+        <location filename="../parse-xml.c" line="2342"/>
         <source>Database query shearwater_profile_sample failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2451"/>
+        <location filename="../parse-xml.c" line="2461"/>
         <source>Database query cobalt_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2458"/>
+        <location filename="../parse-xml.c" line="2468"/>
         <source>Database query cobalt_buddies failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2465"/>
+        <location filename="../parse-xml.c" line="2475"/>
         <source>Database query cobalt_visibility failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2472"/>
+        <location filename="../parse-xml.c" line="2482"/>
         <source>Database query cobalt_location failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2479"/>
+        <location filename="../parse-xml.c" line="2489"/>
         <source>Database query cobalt_location (site) failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2486"/>
+        <location filename="../parse-xml.c" line="2496"/>
         <source>Database query cobalt_profile_sample failed.
 </source>
         <translation type="unfinished"/>
@@ -5752,17 +6002,17 @@ Maximum</source>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2168"/>
-        <location filename="../parse-xml.c" line="2189"/>
-        <location filename="../parse-xml.c" line="2508"/>
-        <location filename="../parse-xml.c" line="2527"/>
+        <location filename="../parse-xml.c" line="2178"/>
+        <location filename="../parse-xml.c" line="2199"/>
+        <location filename="../parse-xml.c" line="2518"/>
+        <location filename="../parse-xml.c" line="2537"/>
         <source>Database query failed '%s'.
 </source>
         <translation>Thất bại khi truy vấn dữ liệu &apos;%s&apos;.
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2848"/>
+        <location filename="../parse-xml.c" line="2909"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation type="unfinished"/>
     </message>
@@ -5772,361 +6022,367 @@ Maximum</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="820"/>
+        <location filename="../planner.c" line="841"/>
         <source>Can&apos;t find gas %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="356"/>
+        <location filename="../planner.c" line="363"/>
         <source>Too many gas mixes</source>
         <translation>Quá nhiều dưỡng khí được trộn</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="540"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="548"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="544"/>
+        <location filename="../planner.c" line="551"/>
         <source>Subsurface dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="548"/>
+        <location filename="../planner.c" line="555"/>
         <source>depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="558"/>
         <source>runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="554"/>
+        <location filename="../planner.c" line="561"/>
         <source>duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="557"/>
+        <location filename="../planner.c" line="564"/>
         <source>gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="594"/>
+        <location filename="../planner.c" line="601"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="602"/>
+        <location filename="../planner.c" line="609"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="615"/>
+        <location filename="../planner.c" line="622"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="622"/>
+        <location filename="../planner.c" line="629"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="635"/>
+        <location filename="../planner.c" line="642"/>
         <source>%3.0f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="638"/>
-        <location filename="../planner.c" line="642"/>
+        <location filename="../planner.c" line="645"/>
+        <location filename="../planner.c" line="649"/>
         <source>%3dmin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="651"/>
+        <location filename="../planner.c" line="658"/>
         <source>(SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="676"/>
+        <location filename="../planner.c" line="683"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="678"/>
+        <location filename="../planner.c" line="685"/>
         <source>Switch gas to %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="697"/>
+        <location filename="../planner.c" line="704"/>
         <source>CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="699"/>
+        <location filename="../planner.c" line="706"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="710"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="705"/>
+        <location filename="../planner.c" line="712"/>
         <source>Gas consumption:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="535"/>
-        <location filename="../planner.c" line="725"/>
-        <location filename="../planner.c" line="730"/>
-        <location filename="../planner.c" line="753"/>
+        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="732"/>
+        <location filename="../planner.c" line="737"/>
+        <location filename="../planner.c" line="762"/>
+        <location filename="../planner.c" line="772"/>
         <source>Warning:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="523"/>
+        <location filename="../planner.c" line="530"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="726"/>
+        <location filename="../planner.c" line="733"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="731"/>
+        <location filename="../planner.c" line="738"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="733"/>
+        <location filename="../planner.c" line="740"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="735"/>
+        <location filename="../planner.c" line="742"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="759"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="1064"/>
+        <location filename="../planner.c" line="769"/>
+        <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="1085"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1099"/>
+        <location filename="../profile.c" line="1113"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1102"/>
+        <location filename="../profile.c" line="1116"/>
         <source>P: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1106"/>
+        <location filename="../profile.c" line="1120"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1112"/>
+        <location filename="../profile.c" line="1126"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1115"/>
+        <location filename="../profile.c" line="1129"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1117"/>
+        <location filename="../profile.c" line="1131"/>
         <source>CNS: %u%%
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1119"/>
+        <location filename="../profile.c" line="1133"/>
         <source>pO%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1121"/>
+        <location filename="../profile.c" line="1135"/>
         <source>pN%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1123"/>
+        <location filename="../profile.c" line="1137"/>
         <source>pHe: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1140"/>
         <source>MOD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1147"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1137"/>
+        <location filename="../profile.c" line="1151"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1149"/>
+        <location filename="../profile.c" line="1163"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1152"/>
+        <location filename="../profile.c" line="1166"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1157"/>
+        <location filename="../profile.c" line="1171"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1174"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1178"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1166"/>
+        <location filename="../profile.c" line="1180"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1183"/>
         <source>TTS: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1172"/>
+        <location filename="../profile.c" line="1186"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1180"/>
+        <location filename="../profile.c" line="1194"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1196"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1185"/>
+        <location filename="../profile.c" line="1199"/>
         <source>TTS: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1188"/>
+        <location filename="../profile.c" line="1202"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1194"/>
+        <location filename="../profile.c" line="1208"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1214"/>
         <source>heartbeat: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1202"/>
+        <location filename="../profile.c" line="1216"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1205"/>
+        <location filename="../profile.c" line="1219"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1314"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1304"/>
-        <location filename="../profile.c" line="1308"/>
-        <location filename="../profile.c" line="1312"/>
+        <location filename="../profile.c" line="1318"/>
+        <location filename="../profile.c" line="1322"/>
+        <location filename="../profile.c" line="1326"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1316"/>
+        <location filename="../profile.c" line="1330"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1334"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1324"/>
-        <location filename="../profile.c" line="1328"/>
+        <location filename="../profile.c" line="1338"/>
+        <location filename="../profile.c" line="1342"/>
         <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1335"/>
+        <location filename="../profile.c" line="1349"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
@@ -6257,6 +6513,7 @@ EADD: %d%s
     </message>
     <message>
         <location filename="../dive.c" line="30"/>
+        <location filename="../equipment.c" line="85"/>
         <source>oxygen</source>
         <translation type="unfinished"/>
     </message>
@@ -6311,97 +6568,97 @@ EADD: %d%s
         <translation>(không có cuộc lặn nào)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sun</source>
         <translation>CN</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Mon</source>
         <translation>T2</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Tue</source>
         <translation>T3</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Wed</source>
         <translation>T4</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Thu</source>
         <translation>T5</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Fri</source>
         <translation>T6</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sat</source>
         <translation>T7</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jan</source>
         <translation>Th1</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Feb</source>
         <translation>Th2</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Mar</source>
         <translation>Th3</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>May</source>
         <translation>Th5</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jun</source>
         <translation>Th6</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Jul</source>
         <translation>Th7</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Aug</source>
         <translation>Th8</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Sep</source>
         <translation>Th9</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Oct</source>
         <translation>Th10</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Nov</source>
         <translation>Th11</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Dec</source>
         <translation>Th12</translation>
     </message>
@@ -7005,13 +7262,13 @@ Uemis Zurich đã được gắn vào đúng cách chưa?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
         <source>GF low</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>%</source>
         <translation type="unfinished"/>
     </message>
@@ -7021,7 +7278,7 @@ Uemis Zurich đã được gắn vào đúng cách chưa?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="335"/>
         <source>Drop to first depth</source>
         <translation type="unfinished"/>
     </message>
@@ -7031,69 +7288,69 @@ Uemis Zurich đã được gắn vào đúng cách chưa?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
         <source>Plan backgas breaks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="355"/>
         <source>Gas options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="376"/>
         <source>Bottom SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="383"/>
         <source>Deco SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="380"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="390"/>
         <source>Bottom pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="403"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="413"/>
         <source>Deco pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="449"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="462"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="478"/>
         <source>Dive notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
         <source>Display runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <source>Display segment duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="531"/>
         <source>Display transitions in deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="538"/>
         <source>Verbatim dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="387"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="410"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="397"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -7113,17 +7370,17 @@ Uemis Zurich đã được gắn vào đúng cách chưa?</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="499"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="515"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/subsurface_zh_TW.ts b/translations/subsurface_zh_TW.ts
index 4a1254a6b..bc9f20da7 100644
--- a/translations/subsurface_zh_TW.ts
+++ b/translations/subsurface_zh_TW.ts
@@ -3,12 +3,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="539"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="522"/>
         <source>Person: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="540"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="523"/>
         <source>Searches for buddies and divemasters</source>
         <translation type="unfinished"/>
     </message>
@@ -16,40 +16,188 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="233"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="230"/>
         <source>No buddies</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>ColumnNameProvider</name>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Dive #</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Location</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>GPS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Avg depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>O₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <source>Sample ndl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="210"/>
+        <location filename="../configuredivecomputer.cpp" line="212"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="226"/>
+        <location filename="../configuredivecomputer.cpp" line="228"/>
         <source>Could not open backup file: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="542"/>
+        <location filename="../configuredivecomputer.cpp" line="552"/>
         <source>Dive computer details read successfully</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="551"/>
+        <location filename="../configuredivecomputer.cpp" line="561"/>
         <source>Setting successfully written to device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="560"/>
+        <location filename="../configuredivecomputer.cpp" line="570"/>
         <source>Device firmware successfully updated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="569"/>
+        <location filename="../configuredivecomputer.cpp" line="579"/>
         <source>Device settings successfully reset</source>
         <translation type="unfinished"/>
     </message>
@@ -847,70 +995,70 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1022"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1044"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1053"/>
         <source>Backup files (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1037"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1031"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1040"/>
         <source>Backup succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1032"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1041"/>
         <source>Your settings have been saved to: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1021"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1030"/>
         <source>Backup dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1036"/>
         <source>XML backup error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1043"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1052"/>
         <source>Restore dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1047"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1056"/>
         <source>XML restore error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1048"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1057"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1063"/>
         <source>Restore succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1064"/>
         <source>Your settings have been restored successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1074"/>
         <source>Select firmware file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1066"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1075"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -968,12 +1116,12 @@
         <translation>於此處按下將移除此氣瓶.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="406"/>
+        <location filename="../qt-ui/models.cpp" line="410"/>
         <source>Cylinder cannot be removed</source>
         <translation>氣瓶無法移除</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="407"/>
+        <location filename="../qt-ui/models.cpp" line="411"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>此氣瓶仍在使用中，在潛水中，只有未使用的氣瓶可被移除。</translation>
     </message>
@@ -1049,12 +1197,12 @@
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="48"/>
         <source>Remove the selected dive computer?</source>
         <translation>是否移除所選擇的潛水電腦？</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="51"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="49"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
         <translation>您確認要
@@ -1069,22 +1217,22 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Model</source>
         <translation>型號</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Device ID</source>
         <translation>裝置 ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1610"/>
+        <location filename="../qt-ui/models.cpp" line="1616"/>
         <source>Nickname</source>
         <translation>別名</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1652"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>點擊這裡移除此潛水電腦。</translation>
     </message>
@@ -1092,117 +1240,145 @@
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="115"/>
         <source>Bailing out to OC</source>
         <translation>跳脫至 OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="120"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="117"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>開始</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>結束</translation>
     </message>
 </context>
 <context>
+    <name>DiveImportedModel</name>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="556"/>
+        <source>Date/time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="558"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="560"/>
+        <source>Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>h:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="582"/>
+        <source>min</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1242"/>
+        <location filename="../qt-ui/models.cpp" line="1248"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1245"/>
+        <location filename="../qt-ui/models.cpp" line="1251"/>
         <source>Date</source>
         <translation>日期</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1248"/>
+        <location filename="../qt-ui/models.cpp" line="1254"/>
         <source>Rating</source>
         <translation>評分</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-ui/models.cpp" line="1257"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1254"/>
+        <location filename="../qt-ui/models.cpp" line="1260"/>
         <source>Duration</source>
         <translation>區間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-ui/models.cpp" line="1263"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-ui/models.cpp" line="1266"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1263"/>
+        <location filename="../qt-ui/models.cpp" line="1269"/>
         <source>Suit</source>
         <translation>防寒衣</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1266"/>
+        <location filename="../qt-ui/models.cpp" line="1272"/>
         <source>Cyl</source>
         <translation>氣瓶</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1269"/>
+        <location filename="../qt-ui/models.cpp" line="1275"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1274"/>
+        <location filename="../qt-ui/models.cpp" line="1280"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1277"/>
+        <location filename="../qt-ui/models.cpp" line="1283"/>
         <source>OTU</source>
         <translation>氧容許量 OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1280"/>
+        <location filename="../qt-ui/models.cpp" line="1286"/>
         <source>Max CNS</source>
         <translation>最大 CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1283"/>
+        <location filename="../qt-ui/models.cpp" line="1289"/>
         <source>Location</source>
         <translation>位置</translation>
     </message>
@@ -1210,87 +1386,87 @@
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="787"/>
+        <location filename="../qt-ui/divelistview.cpp" line="768"/>
         <source>Expand all</source>
         <translation>全部展開</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="788"/>
+        <location filename="../qt-ui/divelistview.cpp" line="769"/>
         <source>Collapse all</source>
         <translation>全部摺疊</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="789"/>
+        <location filename="../qt-ui/divelistview.cpp" line="770"/>
         <source>Collapse others</source>
         <translation>摺疊其它</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="791"/>
+        <location filename="../qt-ui/divelistview.cpp" line="772"/>
         <source>Remove dive(s) from trip</source>
         <translation>從旅程中移除潛水記錄(多支)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="792"/>
+        <location filename="../qt-ui/divelistview.cpp" line="773"/>
         <source>Create new trip above</source>
         <translation>設定為新的旅程</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="806"/>
+        <location filename="../qt-ui/divelistview.cpp" line="787"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>於上方增加潛水記錄(多支)至旅程中</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="808"/>
+        <location filename="../qt-ui/divelistview.cpp" line="789"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>於下方增加潛水記錄(多支)至旅程中</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="812"/>
+        <location filename="../qt-ui/divelistview.cpp" line="793"/>
         <source>Merge trip with trip above</source>
         <translation>與上方旅程合併</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="813"/>
+        <location filename="../qt-ui/divelistview.cpp" line="794"/>
         <source>Merge trip with trip below</source>
         <translation>與下方旅程合併</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="817"/>
+        <location filename="../qt-ui/divelistview.cpp" line="798"/>
         <source>Delete dive(s)</source>
         <translation>刪除潛水記錄(多支)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="819"/>
+        <location filename="../qt-ui/divelistview.cpp" line="800"/>
         <source>Mark dive(s) invalid</source>
         <translation>標示為無效的潛水記錄(多支)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="823"/>
+        <location filename="../qt-ui/divelistview.cpp" line="804"/>
         <source>Merge selected dives</source>
         <translation>合併所選擇的潛水記錄</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="825"/>
+        <location filename="../qt-ui/divelistview.cpp" line="806"/>
         <source>Renumber dive(s)</source>
         <translation>為潛水記錄(多支)重新編號</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="826"/>
+        <location filename="../qt-ui/divelistview.cpp" line="807"/>
         <source>Shift times</source>
         <translation>移動時間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="827"/>
+        <location filename="../qt-ui/divelistview.cpp" line="808"/>
         <source>Load images</source>
         <translation>載入影像</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Open image files</source>
         <translation>開啟影像檔</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="850"/>
+        <location filename="../qt-ui/divelistview.cpp" line="831"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>影像檔案 (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -1475,100 +1651,100 @@
         <translation>Sand</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF 檔案 (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="276"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="280"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="268"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>CSV 檔案 (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="68"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>於不同潛水程式中，做為資料交換使用的通用格式。</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>傳送潛水資料至 divelogs.de 網站。</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>匯出潛點位置至 HTML，並繪製於地圖上。</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurface 原生 XML 格式</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="90"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
         <source>Write depths of images to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
         <source>Export UDDF file as</source>
         <translation>匯出 UDDF 檔案為</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="275"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="267"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
         <source>Export CSV file as</source>
         <translation>匯出 CSV 檔案為</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="286"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="278"/>
         <source>Export world map</source>
         <translation>匯出地圖</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="287"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="307"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="299"/>
         <source>HTML files (*.html)</source>
         <translation>HTML 檔案 (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="291"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="283"/>
         <source>Export Subsurface XML</source>
         <translation>匯出 Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="284"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML 檔案 (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
         <source>Save image depths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="306"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="298"/>
         <source>Export HTML files as</source>
         <translation>匯出 HTML 檔案為</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="353"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="345"/>
         <source>Can&apos;t open file %s</source>
         <translation>無法開啟檔案 %s</translation>
     </message>
@@ -1581,248 +1757,228 @@
         <translation>載入潛水檔案</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="29"/>
-        <source>CSV options</source>
-        <translation>CSV選項</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="281"/>
-        <source>Pre-configured imports</source>
-        <translation>未設定前的匯入</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="122"/>
-        <source>Depth</source>
-        <translation>深度</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="142"/>
-        <source>Stopdepth</source>
-        <translation>停留深度</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="162"/>
-        <source>Pressure</source>
-        <translation>壓力</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="176"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="466"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="551"/>
         <source>Time</source>
         <translation>時間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="183"/>
-        <source>Temp</source>
-        <translation>溫度</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="213"/>
-        <source>NDL</source>
-        <translation>NDL</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="233"/>
-        <source>TTS</source>
-        <translation>TTS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="253"/>
-        <source>Cns</source>
-        <translation>Cns</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="58"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="789"/>
-        <source>Field separator</source>
-        <translation>欄位分隔</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="35"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="363"/>
-        <source>Units</source>
-        <translation>單位</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="42"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="370"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="97"/>
         <source>Metric</source>
         <translation>公制</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="47"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="375"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="102"/>
         <source>Imperial</source>
         <translation>英制</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="169"/>
-        <source>pO₂</source>
-        <translation>pO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="298"/>
-        <source>Manual dives</source>
-        <translation>手動潛水</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="316"/>
-        <source>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="319"/>
-        <source>Date format</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="332"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="59"/>
         <source>dd.mm.yyyy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="337"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="64"/>
         <source>mm/dd/yyyy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="342"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="69"/>
         <source>yyyy-mm-dd</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="392"/>
-        <source>Dive #</source>
-        <translation>潛水號#</translation>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
+        <source>Drag the tags above to each corresponding column below</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="426"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="439"/>
-        <source>Date in dd.mm.yyyy, yyyy-mm-dd or mm/dd/yyyy format</source>
-        <translation type="unfinished"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="549"/>
+        <source>Dive #</source>
+        <translation>潛水號#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="429"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="550"/>
         <source>Date</source>
         <translation>日期</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="500"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="513"/>
-        <source>Dive duration in seconds or in min:sec format</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="503"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="552"/>
         <source>Duration</source>
         <translation>區間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="574"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
         <source>GPS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="591"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
         <source>Tags</source>
         <translation>標籤</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="608"/>
-        <source>Cyl size</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+        <source>O₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="625"/>
-        <source>Air temp</source>
-        <translation>氣溫</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="566"/>
+        <source>He</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="78"/>
+        <source>Seconds</source>
+        <translation>秒</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
+        <source>Minutes</source>
+        <translation>分</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="642"/>
-        <source>Start Pressure</source>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="88"/>
+        <source>Minutes:seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="659"/>
-        <source>Water temp</source>
-        <translation>水溫</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
+        <source>Location</source>
+        <translation>位置</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="676"/>
-        <source>End Press</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
+        <source>Max depth</source>
+        <translation>最大深度</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="388"/>
+        <source>Tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="693"/>
-        <source>O₂</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="424"/>
+        <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="710"/>
-        <source>He</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="447"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="504"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="527"/>
+        <source>Sample time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="742"/>
-        <source>Choose duration format.</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="505"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="528"/>
+        <source>Sample depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="745"/>
-        <source>Duration format</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="451"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="506"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="529"/>
+        <source>Sample temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="758"/>
-        <source>Seconds</source>
-        <translation>秒</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="453"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="507"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
+        <source>Sample po2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="763"/>
-        <source>Minutes</source>
-        <translation>分</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="455"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="508"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
+        <source>Sample cns</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="768"/>
-        <source>Minutes:seconds</source>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="457"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="509"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
+        <source>Sample ndl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="540"/>
-        <source>Location</source>
-        <translation>位置</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="459"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="510"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
+        <source>Sample tts</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="409"/>
-        <source>Max depth</source>
-        <translation>最大深度</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="461"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="511"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="386"/>
-        <source>Field configuration</source>
-        <translation>欄位設定</translation>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="463"/>
+        <source>Samples pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="512"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="449"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
         <source>Mean depth</source>
         <translation>平均深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="483"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
+        <source>Divemaster</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
         <source>Buddy</source>
         <translation>潛伴</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="523"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
         <source>Notes</source>
         <translation>記錄</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="557"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
         <source>Weight</source>
         <translation>重量</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="562"/>
+        <source>Cyl. size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+        <source>Start pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="564"/>
+        <source>End pressure</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+        <source>Air temp.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="568"/>
+        <source>Water temp.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DivePlanner</name>
@@ -1865,42 +2021,42 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="149"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
         <source>unknown</source>
         <translation>未知</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="691"/>
         <source>Final depth</source>
         <translation>最後深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="693"/>
         <source>Run time</source>
         <translation>持續時間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="701"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="695"/>
         <source>Duration</source>
         <translation>區間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="703"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
         <source>Used gas</source>
         <translation>使用氣量</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="705"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
         <source>CC set point</source>
         <translation>密閉式循環設定點</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1044"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1051"/>
         <source>Discard the plan?</source>
         <translation>取消這次計畫?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1045"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="1052"/>
         <source>You are about to discard your plan.</source>
         <translation>您將要放棄你的計劃.</translation>
     </message>
@@ -1908,22 +2064,22 @@
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="268"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="257"/>
         <source>Dive planner points</source>
         <translation>潛水計畫指示</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="272"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="261"/>
         <source>Available gases</source>
         <translation>可用氣瓶</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="295"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="284"/>
         <source>Add dive data point</source>
         <translation>新增潛水資料點</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="304"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="293"/>
         <source>Save new</source>
         <translation type="unfinished"/>
     </message>
@@ -1931,92 +2087,112 @@
 <context>
     <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="103"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
         <source>Depth</source>
         <translation>深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="105"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
         <source>Time</source>
         <translation>時間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="107"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
         <source>Pressure</source>
         <translation>壓力</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
         <source>Temperature</source>
         <translation>溫度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
         <source>Color</source>
         <translation>顔色</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
         <source>Pressure S</source>
         <translation>壓力S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
+        <source>Setpoint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
+        <source>Sensor1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
+        <source>Sensor2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
+        <source>Sensor3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
         <source>Ambient pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
-        <source>Heart Beat</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
+        <source>Heart beat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
-        <source>Gradient Factor</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/>
+        <source>Gradient factor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
-        <source>Mean Depth/s</source>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
+        <source>Mean depth/s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
         <source>Pressure I</source>
         <translation>壓力I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
         <source>User entered</source>
         <translation>使用者輸入</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
         <source>Cylinder index</source>
         <translation>氣瓶編號</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
         <source>Ceiling</source>
         <translation>上限深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
+        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
         <source>SAC</source>
         <translation>耗氣率</translation>
     </message>
@@ -2067,127 +2243,127 @@
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1437"/>
-        <location filename="../qt-ui/models.cpp" line="1483"/>
+        <location filename="../qt-ui/models.cpp" line="1443"/>
+        <location filename="../qt-ui/models.cpp" line="1489"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1440"/>
-        <location filename="../qt-ui/models.cpp" line="1486"/>
+        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1492"/>
         <source>Date</source>
         <translation>日期</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1443"/>
-        <location filename="../qt-ui/models.cpp" line="1489"/>
+        <location filename="../qt-ui/models.cpp" line="1449"/>
+        <location filename="../qt-ui/models.cpp" line="1495"/>
         <source>Rating</source>
         <translation>評分</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1446"/>
+        <location filename="../qt-ui/models.cpp" line="1452"/>
         <source>Depth</source>
         <translation>深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-ui/models.cpp" line="1458"/>
         <source>Temp</source>
         <translation>溫度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1461"/>
         <source>Weight</source>
         <translation>重量</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1473"/>
         <source>SAC</source>
         <translation>耗氣率</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1458"/>
-        <location filename="../qt-ui/models.cpp" line="1504"/>
+        <location filename="../qt-ui/models.cpp" line="1464"/>
+        <location filename="../qt-ui/models.cpp" line="1510"/>
         <source>Suit</source>
         <translation>防寒衣</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1461"/>
-        <location filename="../qt-ui/models.cpp" line="1507"/>
+        <location filename="../qt-ui/models.cpp" line="1467"/>
+        <location filename="../qt-ui/models.cpp" line="1513"/>
         <source>Cyl</source>
         <translation>氣瓶</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1464"/>
-        <location filename="../qt-ui/models.cpp" line="1510"/>
+        <location filename="../qt-ui/models.cpp" line="1470"/>
+        <location filename="../qt-ui/models.cpp" line="1516"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1515"/>
+        <location filename="../qt-ui/models.cpp" line="1521"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1473"/>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-ui/models.cpp" line="1479"/>
+        <location filename="../qt-ui/models.cpp" line="1527"/>
         <source>Max CNS</source>
         <translation>最大 CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
-        <location filename="../qt-ui/models.cpp" line="1524"/>
+        <location filename="../qt-ui/models.cpp" line="1482"/>
+        <location filename="../qt-ui/models.cpp" line="1530"/>
         <source>Location</source>
         <translation>位置</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-ui/models.cpp" line="1498"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1449"/>
-        <location filename="../qt-ui/models.cpp" line="1495"/>
+        <location filename="../qt-ui/models.cpp" line="1455"/>
+        <location filename="../qt-ui/models.cpp" line="1501"/>
         <source>Duration</source>
         <translation>區間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1498"/>
+        <location filename="../qt-ui/models.cpp" line="1504"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-ui/models.cpp" line="1507"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1470"/>
-        <location filename="../qt-ui/models.cpp" line="1518"/>
+        <location filename="../qt-ui/models.cpp" line="1476"/>
+        <location filename="../qt-ui/models.cpp" line="1524"/>
         <source>OTU</source>
         <translation>氧容許量 OTU</translation>
     </message>
@@ -2195,95 +2371,95 @@
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="98"/>
         <source>no dives were selected</source>
         <translation>未選取任何潛水</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="135"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="117"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>建立 zip 壓縮檔上傳失敗: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="161"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="143"/>
         <source>cannot create temporary file: %s</source>
         <translation>無法建立暫存檔案: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/>
         <source>internal error: %s</source>
         <translation>內部錯誤: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="187"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="169"/>
         <source>internal error</source>
         <translation>內部錯誤</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="629"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="828"/>
         <source>Done</source>
         <translation>完成</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="678"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/>
         <source>Uploading dive list...</source>
         <translation>上傳潛水列表...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="710"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="692"/>
         <source>Downloading dive list...</source>
         <translation>下載潛水列表...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="759"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="741"/>
         <source>Downloading %1 dives...</source>
         <translation>下載 %1 潛水...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="785"/>
         <source>Download finished - %1</source>
         <translation>下載結束 - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="820"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="802"/>
         <source>Corrupted download</source>
         <translation>中斷下載</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>此存檔無法被開啟:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="860"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
         <source>Upload failed</source>
         <translation>上傳失敗</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="863"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/>
         <source>Upload successful</source>
         <translation>上傳成功</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
         <source>Login failed</source>
         <translation>登入失敗</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="869"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
         <source>Cannot parse response</source>
         <translation>回覆無法解析</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="880"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
         <source>Error: %1</source>
         <translation>錯誤: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="829"/>
         <source>Upload finished</source>
         <translation>上傳結束</translation>
     </message>
@@ -2291,54 +2467,52 @@
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="122"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="148"/>
-        <source>OK</source>
-        <translation>確認</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="164"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="169"/>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="144"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="168"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="400"/>
         <source>Retry</source>
         <translation>重試</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="258"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="264"/>
         <source>Find Uemis dive computer</source>
         <translation>搜索Uemis潛水設備</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="331"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>選擇記錄檔供潛水電腦下載日誌檔</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="332"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
         <source>Log files (*.log)</source>
         <translation>記錄檔 (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="362"/>
         <source>Warning</source>
         <translation>提醒</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="348"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="363"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>儲存潛水電腦傾印資訊並不會下載潛水記錄</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="359"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="374"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>選擇檔案供潛水電腦記錄傾印資訊</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="360"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="375"/>
         <source>Dump files (*.bin)</source>
         <translation>傾印檔 (*bin)</translation>
     </message>
@@ -2346,7 +2520,7 @@
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="39"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="101"/>
         <source>Vendor</source>
         <translation>廠牌</translation>
     </message>
@@ -2356,54 +2530,74 @@
         <translation>從潛水電腦下載</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="31"/>
         <source>Device or mount point</source>
         <translation>裝置或連接處</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="46"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="111"/>
         <source>Dive computer</source>
         <translation>潛水電腦</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="132"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="45"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="80"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="94"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="52"/>
         <source>Force download of all dives</source>
         <translation>強制下載所有潛水記錄</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
         <source>Always prefer downloaded dives</source>
         <translation>總是保留已下載的潛水</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="95"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
+        <source>Download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
         <source>OK</source>
         <translation>確認</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="102"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="189"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/>
+        <source>Downloaded Dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
+        <source>Select all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
+        <source>Unselect all</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
         <source>Save libdivecomputer logfile</source>
         <translation>儲存 libdivecomputer 日誌檔案</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="87"/>
         <source>Save libdivecomputer dumpfile</source>
         <translation>儲存 libdivecomputer 傾印檔案</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
         <source>Download into new trip</source>
         <translation type="unfinished"/>
     </message>
@@ -2411,12 +2605,12 @@
 <context>
     <name>ExtraDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2280"/>
+        <location filename="../qt-ui/models.cpp" line="2286"/>
         <source>Value</source>
         <translation type="unfinished"/>
     </message>
@@ -2430,21 +2624,21 @@
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="245"/>
-        <source>Your dive profile was updated to facebook.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
-        <source>Photo Upload Failed</source>
+        <source>Your dive profile was updated to Facebook.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="250"/>
-        <source>Your dive profile was not updated to facebook, 
+        <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/socialnetworks.cpp" line="249"/>
+        <source>Photo Upload Failed</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>FilterWidget</name>
@@ -2485,17 +2679,17 @@
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1544"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1621"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1624"/>
         <source>Firmware update failed!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1550"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1627"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -2503,7 +2697,7 @@
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="128"/>
+        <location filename="../qt-ui/globe.cpp" line="119"/>
         <source>Edit selected dive locations</source>
         <translation>編輯所選擇的潛水位置</translation>
     </message>
@@ -2511,7 +2705,7 @@
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="566"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="549"/>
         <source>Location: </source>
         <translation type="unfinished"/>
     </message>
@@ -2519,7 +2713,7 @@
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="286"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="283"/>
         <source>No location set</source>
         <translation type="unfinished"/>
     </message>
@@ -2527,330 +2721,335 @@
 <context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="133"/>
-        <location filename="../qt-ui/maintab.cpp" line="490"/>
+        <location filename="../qt-ui/maintab.ui" line="162"/>
+        <location filename="../qt-ui/maintab.cpp" line="497"/>
         <source>Location</source>
         <translation>位置</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="140"/>
+        <location filename="../qt-ui/maintab.ui" line="67"/>
         <source>Coordinates</source>
         <translation>座標</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="147"/>
+        <location filename="../qt-ui/maintab.ui" line="169"/>
         <source>Divemaster</source>
         <translation>導潛</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="154"/>
+        <location filename="../qt-ui/maintab.ui" line="176"/>
         <source>Buddy</source>
         <translation>潛伴</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="222"/>
+        <location filename="../qt-ui/maintab.ui" line="277"/>
         <source>Tags</source>
         <translation>標籤</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="186"/>
+        <location filename="../qt-ui/maintab.ui" line="208"/>
         <source>Rating</source>
         <translation>評分</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="199"/>
+        <location filename="../qt-ui/maintab.ui" line="221"/>
         <source>Visibility</source>
         <translation>能見度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="208"/>
+        <location filename="../qt-ui/maintab.ui" line="230"/>
         <source>Suit</source>
         <translation>防寒衣</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="465"/>
+        <location filename="../qt-ui/maintab.cpp" line="470"/>
         <source>Dive notes</source>
         <translation>潛水筆記</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="73"/>
-        <location filename="../qt-ui/maintab.ui" line="648"/>
-        <location filename="../qt-ui/maintab.cpp" line="277"/>
+        <location filename="../qt-ui/maintab.ui" line="74"/>
+        <source>Dive mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="102"/>
+        <location filename="../qt-ui/maintab.ui" line="677"/>
+        <location filename="../qt-ui/maintab.cpp" line="279"/>
         <source>Air temp.</source>
         <translation>氣溫</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="80"/>
-        <location filename="../qt-ui/maintab.ui" line="667"/>
-        <location filename="../qt-ui/maintab.cpp" line="278"/>
+        <location filename="../qt-ui/maintab.ui" line="109"/>
+        <location filename="../qt-ui/maintab.ui" line="696"/>
+        <location filename="../qt-ui/maintab.cpp" line="280"/>
         <source>Water temp.</source>
         <translation>水溫</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="229"/>
-        <location filename="../qt-ui/maintab.cpp" line="491"/>
+        <location filename="../qt-ui/maintab.ui" line="284"/>
+        <location filename="../qt-ui/maintab.cpp" line="498"/>
         <source>Notes</source>
         <translation>記錄</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="369"/>
+        <location filename="../qt-ui/maintab.ui" line="398"/>
         <source>Equipment</source>
         <translation>裝備</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="496"/>
+        <location filename="../qt-ui/maintab.ui" line="525"/>
         <source>Gases used</source>
         <translation>消耗氣體</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="515"/>
+        <location filename="../qt-ui/maintab.ui" line="544"/>
         <source>Gas consumed</source>
         <translation>氣體消耗</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="553"/>
+        <location filename="../qt-ui/maintab.ui" line="582"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="591"/>
+        <location filename="../qt-ui/maintab.ui" line="620"/>
         <source>Max. depth</source>
         <translation>最大深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="629"/>
+        <location filename="../qt-ui/maintab.ui" line="658"/>
         <source>Air pressure</source>
         <translation>氣壓</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="686"/>
+        <location filename="../qt-ui/maintab.ui" line="715"/>
         <source>Dive time</source>
         <translation>潛水時間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="845"/>
+        <location filename="../qt-ui/maintab.ui" line="874"/>
         <source>Total time</source>
         <translation>全部時間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="903"/>
+        <location filename="../qt-ui/maintab.ui" line="932"/>
         <source>Gas consumption</source>
         <translation>氣體消耗</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="962"/>
+        <location filename="../qt-ui/maintab.ui" line="991"/>
         <source>Extra data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="968"/>
+        <location filename="../qt-ui/maintab.ui" line="997"/>
         <source>Additional data from dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="54"/>
-        <location filename="../qt-ui/maintab.ui" line="458"/>
+        <location filename="../qt-ui/maintab.ui" line="83"/>
+        <location filename="../qt-ui/maintab.ui" line="487"/>
         <source>Date</source>
         <translation>日期</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="61"/>
+        <location filename="../qt-ui/maintab.ui" line="90"/>
         <source>Time</source>
         <translation>時間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="425"/>
+        <location filename="../qt-ui/maintab.ui" line="454"/>
         <source>Dive info</source>
         <translation>潛水資訊</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="477"/>
+        <location filename="../qt-ui/maintab.ui" line="506"/>
         <source>Interval</source>
         <translation>水面休息時間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="534"/>
-        <location filename="../qt-ui/maintab.ui" line="799"/>
+        <location filename="../qt-ui/maintab.ui" line="563"/>
+        <location filename="../qt-ui/maintab.ui" line="828"/>
         <source>SAC</source>
         <translation>耗氣率</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="610"/>
+        <location filename="../qt-ui/maintab.ui" line="639"/>
         <source>Avg. depth</source>
         <translation>平均深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="572"/>
+        <location filename="../qt-ui/maintab.ui" line="601"/>
         <source>OTU</source>
         <translation>氧容許量 OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="705"/>
+        <location filename="../qt-ui/maintab.ui" line="734"/>
         <source>Salinity</source>
         <translation>鹽度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="742"/>
+        <location filename="../qt-ui/maintab.ui" line="771"/>
         <source>Stats</source>
         <translation>統計</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="775"/>
+        <location filename="../qt-ui/maintab.ui" line="804"/>
         <source>Depth</source>
         <translation>深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="787"/>
+        <location filename="../qt-ui/maintab.ui" line="816"/>
         <source>Temperature</source>
         <translation>溫度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="813"/>
+        <location filename="../qt-ui/maintab.ui" line="842"/>
         <source>Duration</source>
         <translation>區間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="864"/>
+        <location filename="../qt-ui/maintab.ui" line="893"/>
         <source>Dives</source>
         <translation>潛水</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="948"/>
+        <location filename="../qt-ui/maintab.ui" line="977"/>
         <source>Photos</source>
         <translation>照片</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="95"/>
+        <location filename="../qt-ui/maintab.cpp" line="87"/>
         <source>Cylinders</source>
         <translation>氣瓶</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="99"/>
+        <location filename="../qt-ui/maintab.cpp" line="91"/>
         <source>Weights</source>
         <translation>配重</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="55"/>
+        <location filename="../qt-ui/maintab.cpp" line="46"/>
         <source>Apply changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="59"/>
+        <location filename="../qt-ui/maintab.cpp" line="50"/>
         <source>Discard changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="96"/>
+        <location filename="../qt-ui/maintab.cpp" line="88"/>
         <source>Add cylinder</source>
         <translation>新增氣瓶</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="100"/>
+        <location filename="../qt-ui/maintab.cpp" line="92"/>
         <source>Add weight system</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="274"/>
+        <location filename="../qt-ui/maintab.cpp" line="276"/>
         <source>Air temp. [%1]</source>
         <translation>氣溫 [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="275"/>
+        <location filename="../qt-ui/maintab.cpp" line="277"/>
         <source>Water temp. [%1]</source>
         <translation>水溫 [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="312"/>
+        <location filename="../qt-ui/maintab.cpp" line="314"/>
         <source>This trip is being edited.</source>
         <translation>此旅程已被編輯.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="320"/>
+        <location filename="../qt-ui/maintab.cpp" line="322"/>
         <source>Multiple dives are being edited.</source>
         <translation>此些旅程已被編輯.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="322"/>
+        <location filename="../qt-ui/maintab.cpp" line="324"/>
         <source>This dive is being edited.</source>
         <translation>此潛水已被編輯.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="436"/>
-        <location filename="../qt-ui/maintab.cpp" line="460"/>
+        <location filename="../qt-ui/maintab.cpp" line="439"/>
+        <location filename="../qt-ui/maintab.cpp" line="465"/>
         <source>Trip notes</source>
         <translation>旅程筆記</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="458"/>
+        <location filename="../qt-ui/maintab.cpp" line="463"/>
         <source>Trip location</source>
         <translation>旅程位置</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="526"/>
-        <location filename="../qt-ui/maintab.cpp" line="558"/>
-        <location filename="../qt-ui/maintab.cpp" line="562"/>
+        <location filename="../qt-ui/maintab.cpp" line="534"/>
         <location filename="../qt-ui/maintab.cpp" line="566"/>
+        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="574"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="555"/>
+        <location filename="../qt-ui/maintab.cpp" line="563"/>
         <source>Deepest dive</source>
         <translation>最深的潛水</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="556"/>
+        <location filename="../qt-ui/maintab.cpp" line="564"/>
         <source>Shallowest dive</source>
         <translation>最淺的潛水</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="569"/>
+        <location filename="../qt-ui/maintab.cpp" line="577"/>
         <source>Highest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="570"/>
+        <location filename="../qt-ui/maintab.cpp" line="578"/>
         <source>Lowest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="571"/>
+        <location filename="../qt-ui/maintab.cpp" line="579"/>
         <source>Average total SAC of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="582"/>
+        <location filename="../qt-ui/maintab.cpp" line="590"/>
         <source>Highest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="583"/>
+        <location filename="../qt-ui/maintab.cpp" line="591"/>
         <source>Lowest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="584"/>
+        <location filename="../qt-ui/maintab.cpp" line="592"/>
         <source>Average temperature of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="594"/>
+        <location filename="../qt-ui/maintab.cpp" line="602"/>
         <source>Longest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="595"/>
+        <location filename="../qt-ui/maintab.cpp" line="603"/>
         <source>Shortest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="596"/>
+        <location filename="../qt-ui/maintab.cpp" line="604"/>
         <source>Average length of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="620"/>
+        <location filename="../qt-ui/maintab.cpp" line="628"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -2859,17 +3058,17 @@ mixed from Air and using:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="624"/>
+        <location filename="../qt-ui/maintab.cpp" line="632"/>
         <source> and </source>
         <translation>與</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="911"/>
+        <location filename="../qt-ui/maintab.cpp" line="925"/>
         <source>Discard the changes?</source>
         <translation>取消變更？</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="912"/>
+        <location filename="../qt-ui/maintab.cpp" line="926"/>
         <source>You are about to discard your changes.</source>
         <translation>您將要放棄您的變更。</translation>
     </message>
@@ -3016,7 +3215,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="296"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="255"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="232"/>
         <source>Open</source>
         <translation>開啟</translation>
     </message>
@@ -3376,90 +3575,90 @@ p, li { white-space: pre-wrap; }
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="252"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="229"/>
         <source>Open file</source>
         <translation>開啟檔案</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="256"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="233"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="332"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="309"/>
         <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="444"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
         <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="491"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
         <source>Print runtime table</source>
         <translation>列印操作表格</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="834"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="811"/>
         <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="836"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="813"/>
         <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="841"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="818"/>
         <source>Save changes?</source>
         <translation>儲存變更?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1196"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1173"/>
         <source>Save file as</source>
         <translation>另存新檔</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1337"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1314"/>
         <source>Open dive log file</source>
         <translation>打開潛水日誌檔案</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="842"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="819"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>如果不進行儲存, 所做變更將會遺失.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="300"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="444"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="277"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="421"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Warning</source>
         <translation>提醒</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="246"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1180"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1157"/>
         <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="625"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="602"/>
         <source>Yearly statistics</source>
         <translation>年統計</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1197"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1174"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML 檔案 (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1338"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1315"/>
         <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1378"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1355"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>請在嘗試其他編輯時先完成當前編輯</translation>
     </message>
@@ -3467,7 +3666,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="651"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="634"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation type="unfinished"/>
     </message>
@@ -3475,39 +3674,39 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="242"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="239"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="246"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="243"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="244"/>
         <source>Not now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="245"/>
         <source>Update firmware</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
         <source>Firmware upgrade notice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="268"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
         <source>Save the downloaded firmware as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
         <source>HEX files (*.hex)</source>
         <translation type="unfinished"/>
     </message>
@@ -3515,54 +3714,69 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>Open circuit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="481"/>
         <source>Last stop at 20ft</source>
         <translation>上一次在20英呎停留</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="482"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% avg. depth to 20ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="489"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
         <source>20ft to surface</source>
         <translation>水面下 20 英尺</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="485"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
         <source>Last stop at 6m</source>
         <translation>Last stop at 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="493"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% avg. depth to 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="494"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
         <source>6m to surface</source>
         <translation>水面下 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="497"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="498"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
         <source>cuft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="506"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="507"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="500"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="501"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
@@ -3681,6 +3895,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="446"/>
+        <location filename="../qt-ui/preferences.ui" line="816"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -3715,57 +3930,87 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="804"/>
+        <location filename="../qt-ui/preferences.ui" line="795"/>
+        <source>CCR: Show setpoints when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <source>CCR: Show individual O₂ sensor values when viewing pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="809"/>
+        <source>Default CCR set-point for dive planning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="832"/>
+        <source>pSCR O₂ metabolism rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="839"/>
+        <source>pSCR ratio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="846"/>
+        <source>ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="859"/>
+        <source>1:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="875"/>
         <source>System default</source>
         <translation>系統預設</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="843"/>
+        <location filename="../qt-ui/preferences.ui" line="914"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="849"/>
+        <location filename="../qt-ui/preferences.ui" line="920"/>
         <source>Proxy type</source>
         <translation>Proxy 種類</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="862"/>
+        <location filename="../qt-ui/preferences.ui" line="933"/>
         <source>Host</source>
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="888"/>
+        <location filename="../qt-ui/preferences.ui" line="959"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="914"/>
+        <location filename="../qt-ui/preferences.ui" line="985"/>
         <source>Requires authentication</source>
         <translation>需要認證</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="934"/>
+        <location filename="../qt-ui/preferences.ui" line="1005"/>
         <source>Username</source>
         <translation>使用者名稱</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="957"/>
+        <location filename="../qt-ui/preferences.ui" line="1028"/>
         <source>Password</source>
         <translation>密碼</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="985"/>
-        <source>about:blank</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="1011"/>
-        <source>Disconnect from facebook</source>
+        <location filename="../qt-ui/preferences.ui" line="1079"/>
+        <source>Disconnect from Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="824"/>
+        <location filename="../qt-ui/preferences.ui" line="895"/>
         <source>Filter</source>
         <translation>篩選器</translation>
     </message>
@@ -3920,52 +4165,52 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>GFhigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="28"/>
+        <location filename="../qt-ui/preferences.cpp" line="44"/>
         <source>No proxy</source>
         <translation>無 proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="29"/>
+        <location filename="../qt-ui/preferences.cpp" line="45"/>
         <source>System proxy</source>
         <translation>系統 proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="30"/>
+        <location filename="../qt-ui/preferences.cpp" line="46"/>
         <source>HTTP proxy</source>
         <translation>HTTP proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="31"/>
+        <location filename="../qt-ui/preferences.cpp" line="47"/>
         <source>SOCKS proxy</source>
         <translation>SOCKS proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="291"/>
+        <location filename="../qt-ui/preferences.cpp" line="324"/>
         <source>Restart required</source>
         <translation>需要重新啟動</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="292"/>
+        <location filename="../qt-ui/preferences.cpp" line="325"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>您必須重新啟動 Subsurface 來正確載入新的語言。</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="456"/>
+        <location filename="../qt-ui/preferences.cpp" line="494"/>
         <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
         <translation>若按下 OK ，則所有 Subsurface 設定將立即被重設回預設值。</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML 檔案 (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="442"/>
+        <location filename="../qt-ui/preferences.cpp" line="480"/>
         <source>Open default log file</source>
         <translation>開啟預設的日誌檔案</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="455"/>
+        <location filename="../qt-ui/preferences.cpp" line="493"/>
         <source>Warning</source>
         <translation>提醒</translation>
     </message>
@@ -3973,17 +4218,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="91"/>
+        <location filename="../qt-ui/printdialog.cpp" line="85"/>
         <source>&amp;Preview</source>
         <translation>預覽</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="88"/>
+        <location filename="../qt-ui/printdialog.cpp" line="82"/>
         <source>P&amp;rint</source>
         <translation>列印</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="103"/>
+        <location filename="../qt-ui/printdialog.cpp" line="97"/>
         <source>Print</source>
         <translation>列印</translation>
     </message>
@@ -3991,42 +4236,42 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintLayout</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="20"/>
         <source>Dive#</source>
         <translation>潛水編號 #</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="21"/>
         <source>Date</source>
         <translation>日期</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="22"/>
         <source>Depth</source>
         <translation>深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="31"/>
+        <location filename="../qt-ui/printlayout.cpp" line="23"/>
         <source>Duration</source>
         <translation>區間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="32"/>
+        <location filename="../qt-ui/printlayout.cpp" line="24"/>
         <source>Master</source>
         <translation>專長</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="33"/>
+        <location filename="../qt-ui/printlayout.cpp" line="25"/>
         <source>Buddy</source>
         <translation>潛伴</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="34"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Location</source>
         <translation>位置</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="71"/>
+        <location filename="../qt-ui/printlayout.cpp" line="63"/>
         <source>Subsurface cannot find a usable printer on this system!</source>
         <translation type="unfinished"/>
     </message>
@@ -4092,72 +4337,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2095"/>
+        <location filename="../qt-ui/models.cpp" line="2101"/>
         <source>unknown</source>
         <translation>未知</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2100"/>
+        <location filename="../qt-ui/models.cpp" line="2106"/>
         <source>Dive #%1 - %2</source>
         <translation>潛水 #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2103"/>
+        <location filename="../qt-ui/models.cpp" line="2109"/>
         <source>Max depth: %1 %2</source>
         <translation>最大深度: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2110"/>
+        <location filename="../qt-ui/models.cpp" line="2116"/>
         <source>Duration: %1 min</source>
         <translation>區間: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2115"/>
+        <location filename="../qt-ui/models.cpp" line="2121"/>
         <source>Gas used:</source>
         <translation>消耗氣體: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2117"/>
+        <location filename="../qt-ui/models.cpp" line="2123"/>
         <source>Tags:</source>
         <translation>標籤:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2119"/>
+        <location filename="../qt-ui/models.cpp" line="2125"/>
         <source>SAC:</source>
         <translation>耗氣率: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2121"/>
+        <location filename="../qt-ui/models.cpp" line="2127"/>
         <source>Weights:</source>
         <translation>配重:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2126"/>
+        <location filename="../qt-ui/models.cpp" line="2132"/>
         <source>Notes:</source>
         <translation>記錄:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2133"/>
+        <location filename="../qt-ui/models.cpp" line="2139"/>
         <source>Divemaster:</source>
         <translation>導潛:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2135"/>
+        <location filename="../qt-ui/models.cpp" line="2141"/>
         <source>Buddy:</source>
         <translation>潛伴:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2137"/>
+        <location filename="../qt-ui/models.cpp" line="2143"/>
         <source>Suit:</source>
         <translation>防寒衣：</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2139"/>
+        <location filename="../qt-ui/models.cpp" line="2145"/>
         <source>Viz:</source>
         <translation>能見度:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2141"/>
+        <location filename="../qt-ui/models.cpp" line="2147"/>
         <source>Rating:</source>
         <translation>評分:</translation>
     </message>
@@ -4165,103 +4410,108 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="632"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="628"/>
         <source> (#%1 of %2)</source>
         <translation> (#%1 of %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="649"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="630"/>
+        <source>Unknown dive computer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="647"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1163"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1168"/>
         <source>Make first divecomputer</source>
         <translation>設定第 1 潛水電腦</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1165"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
         <source>Delete this divecomputer</source>
         <translation>刪除此潛水電腦</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1179"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1184"/>
         <source>Add gas change</source>
         <translation>增加氣瓶交換</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1182"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1187"/>
         <source> (Tank %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1190"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1195"/>
         <source>Add set-point change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1192"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1197"/>
         <source>Add bookmark</source>
         <translation>新增書籤</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1196"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
         <source>Remove event</source>
         <translation>移除事件</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1206"/>
         <source>Hide similar events</source>
         <translation>隱藏相似事件</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1208"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1213"/>
         <source>Edit name</source>
         <translation>潛水名稱</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1237"/>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1244"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1242"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1249"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1264"/>
         <source>Unhide all events</source>
         <translation>取消隱藏所有事件</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide events</source>
         <translation>隱藏事件</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1293"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
         <source>Hide all %1 events?</source>
         <translation>隱藏所有 %1 事件?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1328"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1333"/>
         <source>Remove the selected event?</source>
         <translation>移除所選擇的事件？</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1329"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1334"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1419"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1424"/>
         <source>Edit name of bookmark</source>
         <translation>編輯書籤名稱</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1420"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
         <source>Custom name:</source>
         <translation>自訂名稱:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1430"/>
         <source>Name is too long!</source>
         <translation type="unfinished"/>
     </message>
@@ -4269,102 +4519,102 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>AIR</source>
         <translation>空氣</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="39"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
         <source>OXYGEN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="224"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="208"/>
         <source>Remove this point</source>
         <translation>移除此點</translation>
     </message>
     <message>
-        <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="57"/>
         <source>Close</source>
         <translation>關閉</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="42"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="25"/>
         <source>Average</source>
         <translation>平均</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="45"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="28"/>
         <source>Minimum</source>
         <translation>最低</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="48"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="31"/>
         <source>Maximum</source>
         <translation>最高</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="297"/>
+        <location filename="../qt-ui/globe.cpp" line="296"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>在地圖上移動, 並且雙擊來設定潛水位置</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="521"/>
+        <location filename="../qt-ui/models.cpp" line="525"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="522"/>
+        <location filename="../qt-ui/models.cpp" line="526"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="546"/>
+        <location filename="../qt-ui/models.cpp" line="550"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="547"/>
+        <location filename="../qt-ui/models.cpp" line="551"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="570"/>
+        <location filename="../qt-ui/models.cpp" line="574"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="571"/>
+        <location filename="../qt-ui/models.cpp" line="575"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="595"/>
+        <location filename="../qt-ui/models.cpp" line="599"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="596"/>
+        <location filename="../qt-ui/models.cpp" line="600"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="531"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="513"/>
         <source>Invalid response from server</source>
         <translation>主機回傳不正確的回應.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="539"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation>預期的 XML 標籤 &apos;DiveDateReader&apos;, 取代了 &apos;%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="585"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="567"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation>無法找到預期的 XML 標籤 &apos;DiveDates&apos;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>異常的 XML 回應. 第 %1 行: %2</translation>
     </message>
@@ -4372,12 +4622,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1450"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1518"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1442"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -4391,12 +4641,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
-        <location filename="../qt-ui/simplewidgets.cpp" line="151"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="134"/>
         <source>New starting number</source>
         <translation>新的開始編號</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="149"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="132"/>
         <source>New number</source>
         <translation>新編號</translation>
     </message>
@@ -4404,12 +4654,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1575"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1653"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1579"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1657"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -4488,12 +4738,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>哪個日期和時間將會被顯示在圖片上?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="276"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="259"/>
         <source>Open image file</source>
         <translation>開啟影像檔</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="278"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="261"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>影像檔案 (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -4546,7 +4796,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <name>SocialNetworkDialog</name>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="282"/>
-        <source>Dive Date: %1 
+        <source>Dive date: %1 
 </source>
         <translation type="unfinished"/>
     </message>
@@ -4570,7 +4820,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
     <message>
         <location filename="../qt-ui/socialnetworks.cpp" line="290"/>
-        <source>Dive Location: %1 
+        <source>Dive location: %1 
 </source>
         <translation type="unfinished"/>
     </message>
@@ -4687,47 +4937,47 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="347"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="329"/>
         <source>Webservice</source>
         <translation>網頁服務</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="393"/>
         <source>Connecting...</source>
         <translation>連結...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="430"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
         <source>Download finished</source>
         <translation>下載結束</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
         <source>Download error: %1</source>
         <translation>下載失敗: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="454"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="436"/>
         <source>Connection error: </source>
         <translation>連結錯誤:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="463"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
         <source>Download successful</source>
         <translation>下載成功</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="457"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="439"/>
         <source>Invalid user identifier!</source>
         <translation>錯誤的使用者 Id !</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="330"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="312"/>
         <source>Enter User ID and click Download</source>
         <translation>輸入使用者 ID 並點選下載</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="460"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="442"/>
         <source>Cannot parse response!</source>
         <translation>回覆無法解析!</translation>
     </message>
@@ -4735,7 +4985,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="592"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="575"/>
         <source>Suits: </source>
         <translation type="unfinished"/>
     </message>
@@ -4743,7 +4993,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="119"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="116"/>
         <source>No suit set</source>
         <translation type="unfinished"/>
     </message>
@@ -4760,7 +5010,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="513"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="496"/>
         <source>Tags: </source>
         <translation type="unfinished"/>
     </message>
@@ -4768,7 +5018,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="144"/>
+        <location filename="../qt-ui/filtermodels.cpp" line="141"/>
         <source>Empty tags</source>
         <translation type="unfinished"/>
     </message>
@@ -4776,17 +5026,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>Description</source>
         <translation>描述</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="912"/>
+        <location filename="../qt-ui/models.cpp" line="916"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -4794,7 +5044,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="141"/>
+        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="131"/>
         <source>Information</source>
         <translation>資訊</translation>
     </message>
@@ -4802,7 +5052,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1090"/>
+        <location filename="../qt-ui/models.cpp" line="1094"/>
         <source> (%1 shown)</source>
         <translation type="unfinished"/>
     </message>
@@ -4810,72 +5060,72 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="64"/>
         <source>Check for updates.</source>
         <translation>檢查有無更新。</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="66"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="65"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface 無法確認更新。</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="70"/>
         <source>The following error occurred:</source>
         <translation>錯誤持續發生:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="72"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="71"/>
         <source>Please check your internet connection.</source>
         <translation>請確認您的網路連線。</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="85"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="84"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="88"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="87"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="95"/>
         <source>A new version of Subsurface is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="97"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="96"/>
         <source>Latest version is %1, please check with your OS vendor for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="103"/>
         <source>Newest release version is </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="105"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="104"/>
         <source>The server returned the following information:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="121"/>
         <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="122"/>
         <source>Decline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="124"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="123"/>
         <source>Accept</source>
         <translation>同意</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="126"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="125"/>
         <source>Automatic check for updates</source>
         <translation type="unfinished"/>
     </message>
@@ -4883,13 +5133,13 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>UserManual</name>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="55"/>
+        <location filename="../qt-ui/usermanual.cpp" line="54"/>
         <source>User Manual</source>
         <translation>使用者說明</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="72"/>
-        <location filename="../qt-ui/usermanual.cpp" line="78"/>
+        <location filename="../qt-ui/usermanual.cpp" line="71"/>
+        <location filename="../qt-ui/usermanual.cpp" line="77"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>無法找到 Subsurface 使用說明</translation>
     </message>
@@ -4967,85 +5217,85 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="42"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="41"/>
         <source>
 Operating System: %1</source>
         <translation>
 作業系統: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="44"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
         <source>
 CPU Architecture: %1</source>
         <translation>
 CPU 架構: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
         <source>
 Language: %1</source>
         <translation>
 語言: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="93"/>
         <source>Should we ask you later?</source>
         <translation>是否稍後詢問？</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="94"/>
         <source>Don&apos;t ask me again</source>
         <translation>請勿再問我</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
         <source>Ask later</source>
         <translation>稍後再詢問</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="115"/>
         <source>Submit user survey.</source>
         <translation>傳送使用者調查。</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
         <source>Ask again?</source>
         <translation>再次詢問？</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="17"/>
         <source>Send</source>
         <translation>傳送</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="46"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
         <source>
 OS CPU Architecture: %1</source>
         <translation>
 OS CPU 架構: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="116"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation>Subsurface 無法傳送使用者調查</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="121"/>
         <source>The following error occurred:</source>
         <translation>錯誤持續發生:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>Please check your internet connection.</source>
         <translation>請確認您的網路連線。</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="132"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="131"/>
         <source>Survey successfully submitted.</source>
         <translation>成功傳送調查。</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="137"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="136"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation>嘗試確認更新發生錯誤。&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -5053,12 +5303,12 @@ OS CPU 架構: %1</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>Description</source>
         <translation>描述</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="783"/>
+        <location filename="../qt-ui/models.cpp" line="787"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -5106,12 +5356,12 @@ OS CPU 架構: %1</translation>
         <translation>上傳</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="265"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="247"/>
         <source>Operation timed out</source>
         <translation>操作時間結束</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="268"/>
         <source>Transferring data...</source>
         <translation type="unfinished"/>
     </message>
@@ -5119,17 +5369,17 @@ OS CPU 架構: %1</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Type</source>
         <translation>類型</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="430"/>
+        <location filename="../qt-ui/models.cpp" line="434"/>
         <source>Weight</source>
         <translation>重量</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="496"/>
+        <location filename="../qt-ui/models.cpp" line="500"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>按此處移除配重系統。</translation>
     </message>
@@ -5137,19 +5387,19 @@ OS CPU 架構: %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1479"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1487"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1497"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1547"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1555"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1566"/>
         <source>Failed!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1506"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1576"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1510"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1580"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -5157,79 +5407,79 @@ OS CPU 架構: %1</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1841"/>
+        <location filename="../qt-ui/models.cpp" line="1847"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>年 
  &gt; 月 / 旅程</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1844"/>
+        <location filename="../qt-ui/models.cpp" line="1850"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1847"/>
+        <location filename="../qt-ui/models.cpp" line="1853"/>
         <source>Duration 
  Total</source>
         <translation>區間 
 全部</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1850"/>
+        <location filename="../qt-ui/models.cpp" line="1856"/>
         <source>
 Average</source>
         <translation>
 平均</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1853"/>
+        <location filename="../qt-ui/models.cpp" line="1859"/>
         <source>
 Shortest</source>
         <translation>
 最短</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1856"/>
+        <location filename="../qt-ui/models.cpp" line="1862"/>
         <source>
 Longest</source>
         <translation>
 最長</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1859"/>
+        <location filename="../qt-ui/models.cpp" line="1865"/>
         <source>Depth (%1)
  Average</source>
         <translation>深度 (%1)
 平均</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1862"/>
-        <location filename="../qt-ui/models.cpp" line="1871"/>
-        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1886"/>
         <source>
 Minimum</source>
         <translation>
 最小</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1865"/>
-        <location filename="../qt-ui/models.cpp" line="1874"/>
-        <location filename="../qt-ui/models.cpp" line="1883"/>
+        <location filename="../qt-ui/models.cpp" line="1871"/>
+        <location filename="../qt-ui/models.cpp" line="1880"/>
+        <location filename="../qt-ui/models.cpp" line="1889"/>
         <source>
 Maximum</source>
         <translation>
 最大</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1868"/>
+        <location filename="../qt-ui/models.cpp" line="1874"/>
         <source>SAC (%1)
  Average</source>
         <translation>耗氣率 (%1)
 平均</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1877"/>
+        <location filename="../qt-ui/models.cpp" line="1883"/>
         <source>Temp. (%1)
  Average</source>
         <translation>溫度 (%1)
@@ -5310,40 +5560,40 @@ Maximum</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1508"/>
+        <location filename="../dive.c" line="1530"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) 或 (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="464"/>
+        <location filename="../divelist.c" line="467"/>
         <location filename="../equipment.c" line="81"/>
-        <location filename="../planner.c" line="1060"/>
-        <location filename="../planner.c" line="1063"/>
+        <location filename="../planner.c" line="1081"/>
+        <location filename="../planner.c" line="1084"/>
         <source>air</source>
         <translation>air</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="192"/>
+        <location filename="../equipment.c" line="194"/>
         <source>integrated</source>
         <translation>整合型</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="193"/>
+        <location filename="../equipment.c" line="195"/>
         <source>belt</source>
         <translation>配重帶</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="194"/>
+        <location filename="../equipment.c" line="196"/>
         <source>ankle</source>
         <translation>腳踝</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="195"/>
+        <location filename="../equipment.c" line="197"/>
         <source>backplate weight</source>
         <translation>背板配重</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="196"/>
+        <location filename="../equipment.c" line="198"/>
         <source>clip-on</source>
         <translation>吊掛式</translation>
     </message>
@@ -5351,7 +5601,7 @@ Maximum</source>
         <location filename="../file.c" line="112"/>
         <location filename="../file.c" line="434"/>
         <location filename="../file.c" line="506"/>
-        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="925"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>無法讀取 &apos;%s&apos;</translation>
     </message>
@@ -5408,9 +5658,9 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../file.c" line="869"/>
-        <location filename="../file.c" line="909"/>
-        <location filename="../file.c" line="1007"/>
+        <location filename="../file.c" line="870"/>
+        <location filename="../file.c" line="917"/>
+        <location filename="../file.c" line="1016"/>
         <source>Maximum number of supported columns on CSV import is %d</source>
         <translation>CSV 匯入最大支援 %d 欄位.</translation>
     </message>
@@ -5581,27 +5831,27 @@ Maximum</source>
         <translation>錯誤的事件編號</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="421"/>
+        <location filename="../libdivecomputer.c" line="419"/>
         <source>Unable to create parser for %s %s</source>
         <translation>無法建立解析 %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="427"/>
+        <location filename="../libdivecomputer.c" line="425"/>
         <source>Error registering the data</source>
         <translation>錯誤的登錄資料</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="435"/>
+        <location filename="../libdivecomputer.c" line="433"/>
         <source>Error parsing the datetime</source>
         <translation>日期時間解析錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="451"/>
+        <location filename="../libdivecomputer.c" line="450"/>
         <source>Dive %d: %s</source>
         <translation>潛水 %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="455"/>
+        <location filename="../libdivecomputer.c" line="454"/>
         <source>Error parsing the divetime</source>
         <translation>潛水時間解析錯誤</translation>
     </message>
@@ -5611,156 +5861,156 @@ Maximum</source>
         <translation>最大深度解析錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="482"/>
+        <location filename="../libdivecomputer.c" line="483"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="501"/>
+        <location filename="../libdivecomputer.c" line="503"/>
         <source>Error parsing the gas mix count</source>
         <translation>混合氣體數量解析錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="513"/>
+        <location filename="../libdivecomputer.c" line="515"/>
         <source>Error obtaining water salinity</source>
         <translation>得到錯誤的海水鹽度</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="521"/>
+        <location filename="../libdivecomputer.c" line="524"/>
         <source>Error obtaining surface pressure</source>
         <translation>得到錯誤的水面壓力</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="545"/>
+        <location filename="../libdivecomputer.c" line="549"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="562"/>
+        <location filename="../libdivecomputer.c" line="569"/>
         <source>Error parsing the gas mix</source>
         <translation>混合氣體解析錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="569"/>
+        <location filename="../libdivecomputer.c" line="576"/>
         <source>Error parsing the samples</source>
         <translation>樣本解析錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="706"/>
+        <location filename="../libdivecomputer.c" line="713"/>
         <source>Event: waiting for user action</source>
         <translation>事件: 等待使用者動作</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="714"/>
+        <location filename="../libdivecomputer.c" line="721"/>
         <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="778"/>
+        <location filename="../libdivecomputer.c" line="785"/>
         <source>Error registering the event handler.</source>
         <translation>錯誤的註冊程序.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="783"/>
+        <location filename="../libdivecomputer.c" line="790"/>
         <source>Error registering the cancellation handler.</source>
         <translation>錯誤的註冊取消程序.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="804"/>
+        <location filename="../libdivecomputer.c" line="811"/>
         <source>Dive data import error</source>
         <translation>匯入潛水資料錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="843"/>
+        <location filename="../libdivecomputer.c" line="850"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>無法建立 libdivecomputer 上下文</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="850"/>
+        <location filename="../libdivecomputer.c" line="857"/>
         <source>Unable to open %s %s (%s)</source>
         <translation> 無法開啟 %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="858"/>
+        <location filename="../libdivecomputer.c" line="865"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="506"/>
+        <location filename="../parse-xml.c" line="516"/>
         <source>Strange percentage reading %s
 </source>
         <translation>有問題的讀取比例 %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1760"/>
+        <location filename="../parse-xml.c" line="1770"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>無法解析訊息 &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1989"/>
-        <location filename="../parse-xml.c" line="2137"/>
+        <location filename="../parse-xml.c" line="1999"/>
+        <location filename="../parse-xml.c" line="2147"/>
         <source>Database query dm4_events failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1996"/>
-        <location filename="../parse-xml.c" line="2144"/>
+        <location filename="../parse-xml.c" line="2006"/>
+        <location filename="../parse-xml.c" line="2154"/>
         <source>Database query dm4_tags failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2318"/>
+        <location filename="../parse-xml.c" line="2328"/>
         <source>Database query shearwater_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2325"/>
+        <location filename="../parse-xml.c" line="2335"/>
         <source>Database query shearwater_changes failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2332"/>
+        <location filename="../parse-xml.c" line="2342"/>
         <source>Database query shearwater_profile_sample failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2451"/>
+        <location filename="../parse-xml.c" line="2461"/>
         <source>Database query cobalt_cylinders failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2458"/>
+        <location filename="../parse-xml.c" line="2468"/>
         <source>Database query cobalt_buddies failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2465"/>
+        <location filename="../parse-xml.c" line="2475"/>
         <source>Database query cobalt_visibility failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2472"/>
+        <location filename="../parse-xml.c" line="2482"/>
         <source>Database query cobalt_location failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2479"/>
+        <location filename="../parse-xml.c" line="2489"/>
         <source>Database query cobalt_location (site) failed.
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2486"/>
+        <location filename="../parse-xml.c" line="2496"/>
         <source>Database query cobalt_profile_sample failed.
 </source>
         <translation type="unfinished"/>
@@ -5773,17 +6023,17 @@ Maximum</source>
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2168"/>
-        <location filename="../parse-xml.c" line="2189"/>
-        <location filename="../parse-xml.c" line="2508"/>
-        <location filename="../parse-xml.c" line="2527"/>
+        <location filename="../parse-xml.c" line="2178"/>
+        <location filename="../parse-xml.c" line="2199"/>
+        <location filename="../parse-xml.c" line="2518"/>
+        <location filename="../parse-xml.c" line="2537"/>
         <source>Database query failed '%s'.
 </source>
         <translation>資料庫要求錯誤 &apos;%s&apos; .
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2848"/>
+        <location filename="../parse-xml.c" line="2909"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>無法開啟樣式 %s</translation>
     </message>
@@ -5793,161 +6043,167 @@ Maximum</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="820"/>
+        <location filename="../planner.c" line="841"/>
         <source>Can&apos;t find gas %s</source>
         <translation>無法找到氣體 %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="356"/>
+        <location filename="../planner.c" line="363"/>
         <source>Too many gas mixes</source>
         <translation>太多氣體混合</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="533"/>
+        <location filename="../planner.c" line="540"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="541"/>
+        <location filename="../planner.c" line="548"/>
         <source>based on GFlow = %d and GFhigh = %d</source>
         <translation>以 GFlow = %d 與 GFhigh = %d 為基礎</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="544"/>
+        <location filename="../planner.c" line="551"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface 潛水計畫</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="548"/>
+        <location filename="../planner.c" line="555"/>
         <source>depth</source>
         <translation>深度</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="558"/>
         <source>runtime</source>
         <translation>作業時間</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="554"/>
+        <location filename="../planner.c" line="561"/>
         <source>duration</source>
         <translation>時間</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="557"/>
+        <location filename="../planner.c" line="564"/>
         <source>gas</source>
         <translation>氣體</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="594"/>
+        <location filename="../planner.c" line="601"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="602"/>
+        <location filename="../planner.c" line="609"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>禁搭飛機 %.*f %s 在 %d:%02d min - 運行時間 %d:%02u 在 %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="615"/>
+        <location filename="../planner.c" line="622"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="622"/>
+        <location filename="../planner.c" line="629"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>停留在 %.*f %s for %d:%02d min - 運作時間 %d:%02u 於 %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="635"/>
+        <location filename="../planner.c" line="642"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="638"/>
-        <location filename="../planner.c" line="642"/>
+        <location filename="../planner.c" line="645"/>
+        <location filename="../planner.c" line="649"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="651"/>
+        <location filename="../planner.c" line="658"/>
         <source>(SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="676"/>
+        <location filename="../planner.c" line="683"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="678"/>
+        <location filename="../planner.c" line="685"/>
         <source>Switch gas to %s</source>
         <translation>更換氣體至 %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="697"/>
+        <location filename="../planner.c" line="704"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="699"/>
+        <location filename="../planner.c" line="706"/>
         <source>OTU</source>
         <translation>氧容許量 OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="703"/>
+        <location filename="../planner.c" line="710"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="705"/>
+        <location filename="../planner.c" line="712"/>
         <source>Gas consumption:</source>
         <translation>氣體消耗:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="535"/>
-        <location filename="../planner.c" line="725"/>
-        <location filename="../planner.c" line="730"/>
-        <location filename="../planner.c" line="753"/>
+        <location filename="../planner.c" line="542"/>
+        <location filename="../planner.c" line="732"/>
+        <location filename="../planner.c" line="737"/>
+        <location filename="../planner.c" line="762"/>
+        <location filename="../planner.c" line="772"/>
         <source>Warning:</source>
         <translation>提醒:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="523"/>
+        <location filename="../planner.c" line="530"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="726"/>
+        <location filename="../planner.c" line="733"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>指定的氣瓶氣體超過供給量！</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="731"/>
+        <location filename="../planner.c" line="738"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>無足夠的預留氣體可供上升使用！</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="733"/>
+        <location filename="../planner.c" line="740"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s 在計畫上升中)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="735"/>
+        <location filename="../planner.c" line="742"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s 在計畫上升期間) of %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="750"/>
+        <location filename="../planner.c" line="759"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>高 pO₂ 數值 %.2f 發生於 %d:%02u 使用氣體 %s 在深度 %.*f %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="1064"/>
+        <location filename="../planner.c" line="769"/>
+        <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="1085"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1099"/>
+        <location filename="../profile.c" line="1113"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -5956,63 +6212,63 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1102"/>
+        <location filename="../profile.c" line="1116"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1106"/>
+        <location filename="../profile.c" line="1120"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1112"/>
+        <location filename="../profile.c" line="1126"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1115"/>
+        <location filename="../profile.c" line="1129"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1117"/>
+        <location filename="../profile.c" line="1131"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1119"/>
+        <location filename="../profile.c" line="1133"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1121"/>
+        <location filename="../profile.c" line="1135"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1123"/>
+        <location filename="../profile.c" line="1137"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1140"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1147"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -6021,7 +6277,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1137"/>
+        <location filename="../profile.c" line="1151"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -6030,148 +6286,148 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1149"/>
+        <location filename="../profile.c" line="1163"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>安全停留: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1152"/>
+        <location filename="../profile.c" line="1166"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>安全停留: 未知時間 @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1157"/>
+        <location filename="../profile.c" line="1171"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1174"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>減壓: 未知時間 @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1178"/>
         <source>In deco
 </source>
         <translation>減壓中
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1166"/>
+        <location filename="../profile.c" line="1180"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1169"/>
+        <location filename="../profile.c" line="1183"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1172"/>
+        <location filename="../profile.c" line="1186"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>減壓: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1180"/>
+        <location filename="../profile.c" line="1194"/>
         <source>In deco (calc)
 </source>
         <translation>減壓 (計算)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1182"/>
+        <location filename="../profile.c" line="1196"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL:%umin (預計)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1185"/>
+        <location filename="../profile.c" line="1199"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1188"/>
+        <location filename="../profile.c" line="1202"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>計算的上限深度 %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1194"/>
+        <location filename="../profile.c" line="1208"/>
         <source>Tissue %.0fmin: %.0f%s
 </source>
         <translation>組織 %.0fmin: %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1200"/>
+        <location filename="../profile.c" line="1214"/>
         <source>heartbeat: %d
 </source>
         <translation>心跳: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1202"/>
+        <location filename="../profile.c" line="1216"/>
         <source>bearing: %d
 </source>
         <translation>方位: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1205"/>
+        <location filename="../profile.c" line="1219"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1300"/>
+        <location filename="../profile.c" line="1314"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1304"/>
-        <location filename="../profile.c" line="1308"/>
-        <location filename="../profile.c" line="1312"/>
+        <location filename="../profile.c" line="1318"/>
+        <location filename="../profile.c" line="1322"/>
+        <location filename="../profile.c" line="1326"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1316"/>
+        <location filename="../profile.c" line="1330"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1334"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1324"/>
-        <location filename="../profile.c" line="1328"/>
+        <location filename="../profile.c" line="1338"/>
+        <location filename="../profile.c" line="1342"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1335"/>
+        <location filename="../profile.c" line="1349"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -6302,6 +6558,7 @@ EADD: %d%s
     </message>
     <message>
         <location filename="../dive.c" line="30"/>
+        <location filename="../equipment.c" line="85"/>
         <source>oxygen</source>
         <translation type="unfinished"/>
     </message>
@@ -6356,97 +6613,97 @@ EADD: %d%s
         <translation>(無潛水)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sun</source>
         <translation>周日</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Mon</source>
         <translation>周一</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Tue</source>
         <translation>周二</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Wed</source>
         <translation>周三</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Thu</source>
         <translation>周四</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Fri</source>
         <translation>周五</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="88"/>
+        <location filename="../subsurfacestartup.c" line="91"/>
         <source>Sat</source>
         <translation>周六</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jan</source>
         <translation>1月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Feb</source>
         <translation>2月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Mar</source>
         <translation>3月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Apr</source>
         <translation>4月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>May</source>
         <translation>5月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="97"/>
+        <location filename="../subsurfacestartup.c" line="100"/>
         <source>Jun</source>
         <translation>6月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Jul</source>
         <translation>7月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Aug</source>
         <translation>8月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Sep</source>
         <translation>9月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Oct</source>
         <translation>10月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Nov</source>
         <translation>11月</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="98"/>
+        <location filename="../subsurfacestartup.c" line="101"/>
         <source>Dec</source>
         <translation>12月</translation>
     </message>
@@ -7050,13 +7307,13 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>計畫</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
         <source>GF low</source>
         <translation>低 GF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="275"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
         <source>%</source>
         <translation>%</translation>
     </message>
@@ -7066,7 +7323,7 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>高 GF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="308"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="335"/>
         <source>Drop to first depth</source>
         <translation>下降至第 1 深度</translation>
     </message>
@@ -7076,69 +7333,69 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Last stop at 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
         <source>Plan backgas breaks</source>
         <translation>計畫後氣瓶中斷點</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="345"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="355"/>
         <source>Gas options</source>
         <translation>氣體選項</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="366"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="376"/>
         <source>Bottom SAC</source>
         <translation>水底耗氣率</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="373"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="383"/>
         <source>Deco SAC</source>
         <translation>減壓 SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="380"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="390"/>
         <source>Bottom pO₂</source>
         <translation>水底 pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="403"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="413"/>
         <source>Deco pO₂</source>
         <translation>減壓 pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="439"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="452"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="449"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="462"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="468"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="478"/>
         <source>Dive notes</source>
         <translation>潛水筆記</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
         <source>Display runtime</source>
         <translation>顯示運作時間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="508"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
         <source>Display segment duration</source>
         <translation>顯示分段區間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="521"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="531"/>
         <source>Display transitions in deco</source>
         <translation>在減壓中顯示禁飛時間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="538"/>
         <source>Verbatim dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="387"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="410"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="397"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="420"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -7158,17 +7415,17 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>水面下 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="489"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="499"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>在潛水計畫中，顯示停留的操作時間 (絕對時間) 。</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="505"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="515"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>在潛水計畫中，顯示停留的時間 (相對時間) 。</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>在潛水計畫中，列出禁飛時間或標記為提示</translation>
     </message>